From eb16e9cbbf3203725e1088b44e9faa3288f95155 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 09:15:25 +0600 Subject: [PATCH 1/9] Fixed checking of domain status before interface data loading --- source/ubl-settings-system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 047ac4c..47abbb5 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -562,7 +562,6 @@ connection_window *yon_connection_window_new(){ g_signal_connect(G_OBJECT(window->StatusEntry),"clicked",G_CALLBACK(on_status_clicked),window); g_signal_connect(G_OBJECT(window->FindEntry),"clicked",G_CALLBACK(on_find_domains_clicked),window); g_signal_connect(G_OBJECT(window->AdressEntry),"focus-out-event",G_CALLBACK(yon_update_thread),window); - yon_update_thread(NULL,NULL,window); return window; } @@ -649,6 +648,7 @@ void on_domain_opened(GtkWidget *self, main_window *widgets){ yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_domain_connect),dict); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_check_domain_connected),widgets); + yon_update_thread(NULL,NULL,window); gtk_widget_show(window->Window); } From a8ef2f819b1d95eecc924c7b6847272092fc5e56 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 09:21:48 +0600 Subject: [PATCH 2/9] Increased minimum size for disconnect window --- ubl-settings-system-domain.glade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubl-settings-system-domain.glade b/ubl-settings-system-domain.glade index 15a0436..e7ba039 100644 --- a/ubl-settings-system-domain.glade +++ b/ubl-settings-system-domain.glade @@ -4,6 +4,8 @@ + 450 + 300 False True com.ublinux.ubl-settings-repomanager From 67f3a0c24851dc8053a20918dcf6a2f9adab9cbe Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 09:23:05 +0600 Subject: [PATCH 3/9] Increased minimum size for disconnect window --- ubl-settings-system-domain.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubl-settings-system-domain.glade b/ubl-settings-system-domain.glade index e7ba039..9f1303a 100644 --- a/ubl-settings-system-domain.glade +++ b/ubl-settings-system-domain.glade @@ -5,10 +5,10 @@ 450 - 300 + 240 False True - com.ublinux.ubl-settings-repomanager + com.ublinux.ubl-settings-system True From af86d25f7b1a7f8b7291aad0184e2e79b41e8a8e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 15:03:21 +0600 Subject: [PATCH 4/9] Temporarily back vte terminal calls --- source/ubl-settings-system.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 47abbb5..607a28d 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -490,7 +490,10 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ char *final = yon_char_unite(!yon_char_is_empty(kerberos)?kerberos_addition_command(kerberos):"",!yon_char_is_empty(kerberos)?" ":"",!yon_char_is_empty(dns)?dns_addition_command(dns):"",!yon_char_is_empty(dns)?" ":"",!yon_char_is_empty(client)?client_addition_command(client):"",!yon_char_is_empty(client)?" ":"",NULL); yon_debug_output(domain_connect_command(adress,login,password,final)); yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final))); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } @@ -498,14 +501,20 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(domain_info(target)); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); } } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domains_seek_command); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -514,7 +523,10 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(get_domain_info_command); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,get_domain_info_command); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } } } @@ -578,7 +590,10 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ return; } yon_debug_output(domain_disconnect_command(adress,login,password)); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } From 513eb890bd82dd9fcbe1a4eaf5469b2cbab40a9b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 15:29:09 +0600 Subject: [PATCH 5/9] Removed vte calls --- source/ubl-settings-system.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 607a28d..47abbb5 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -490,10 +490,7 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ char *final = yon_char_unite(!yon_char_is_empty(kerberos)?kerberos_addition_command(kerberos):"",!yon_char_is_empty(kerberos)?" ":"",!yon_char_is_empty(dns)?dns_addition_command(dns):"",!yon_char_is_empty(dns)?" ":"",!yon_char_is_empty(client)?client_addition_command(client):"",!yon_char_is_empty(client)?" ":"",NULL); yon_debug_output(domain_connect_command(adress,login,password,final)); yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final))); - domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); - gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } @@ -501,20 +498,14 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(domain_info(target)); - domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target)); - gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); } } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domains_seek_command); - domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command); - gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -523,10 +514,7 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(get_domain_info_command); - domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,get_domain_info_command); - gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } } } @@ -590,10 +578,7 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ return; } yon_debug_output(domain_disconnect_command(adress,login,password)); - domain_info_window *dialog = yon_information_window_new(); - yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); - gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); + yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } From dbef66d7b81215880eddebd01c60ee303049c31a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 15:41:21 +0600 Subject: [PATCH 6/9] Temporarily back vte terminal calls --- source/ubl-settings-system.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 47abbb5..607a28d 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -490,7 +490,10 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ char *final = yon_char_unite(!yon_char_is_empty(kerberos)?kerberos_addition_command(kerberos):"",!yon_char_is_empty(kerberos)?" ":"",!yon_char_is_empty(dns)?dns_addition_command(dns):"",!yon_char_is_empty(dns)?" ":"",!yon_char_is_empty(client)?client_addition_command(client):"",!yon_char_is_empty(client)?" ":"",NULL); yon_debug_output(domain_connect_command(adress,login,password,final)); yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final))); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } @@ -498,14 +501,20 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(domain_info(target)); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); } } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domains_seek_command); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -514,7 +523,10 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); if (!yon_char_is_empty(target)){ yon_debug_output(get_domain_info_command); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,get_domain_info_command); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } } } @@ -578,7 +590,10 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ return; } yon_debug_output(domain_disconnect_command(adress,login,password)); - yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); + domain_info_window *dialog = yon_information_window_new(); + yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); + gtk_widget_show(dialog->Window); + // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } From e4fab2fadf2f119945571d31461f9c2d032d8582 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 16:13:11 +0600 Subject: [PATCH 7/9] Return of VTE-s; fixed freeze of vte window --- source/ubl-settings-system.c | 5 +++++ source/ubl-settings-system.h | 14 +++++++------- ubl-settings-system-domain-view.glade | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 607a28d..1b063a5 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -492,6 +492,7 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final))); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); + gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); @@ -503,6 +504,7 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domain_info(target)); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target)); + gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); @@ -513,6 +515,7 @@ void on_find_domains_clicked(GtkWidget *self, connection_window *window){ yon_debug_output(domains_seek_command); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command); + gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -525,6 +528,7 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition yon_debug_output(get_domain_info_command); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,get_domain_info_command); + gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window)); gtk_widget_show(dialog->Window); // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } @@ -592,6 +596,7 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ yon_debug_output(domain_disconnect_command(adress,login,password)); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); + gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h index 345a4b4..208f262 100644 --- a/source/ubl-settings-system.h +++ b/source/ubl-settings-system.h @@ -65,18 +65,18 @@ #define check_domain_access_command(targeet) yon_char_append("adcli info --domain ",target) #define get_domain_info_command "ubdomain-client list " #define domains_seek_command "ubdomain-client discover" -#define domain_connect_command(target,user,password, addition) yon_char_unite("ubdomain-client join",!yon_char_is_empty(user)?" --user \"":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(user)?"\"":"",!yon_char_is_empty(password)?" --password \"":"",!yon_char_is_empty(password)?password:"",!yon_char_is_empty(password)?"\"":""," --domain \"",target,"\"", addition,NULL) -#define domain_disconnect_command(target,user,password) yon_char_unite("ubdomain-client leave",!yon_char_is_empty(user)?" --user \"":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(user)?"\"":"",!yon_char_is_empty(password)?" --password \"":"",!yon_char_is_empty(password)?password:"",!yon_char_is_empty(password)?"\"":""," --domain \"",target,"\"",NULL) -#define kerberos_addition_command(target) yon_char_unite(" --domain_server \"",target,"\"",NULL) -#define dns_addition_command(target) yon_char_unite(" --dns \"",target,"\"",NULL) -#define client_addition_command(target) yon_char_unite(" --domain_client \"",target,"\"",NULL) +#define domain_connect_command(target,user,password, addition) yon_char_unite("ubdomain-client join",!yon_char_is_empty(user)?" --user ":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(password)?" --password ":"",!yon_char_is_empty(password)?password:""," --domain ",target, addition,NULL) +#define domain_disconnect_command(target,user,password) yon_char_unite("ubdomain-client leave",!yon_char_is_empty(user)?" --user ":"",!yon_char_is_empty(user)?user:"",!yon_char_is_empty(password)?" --password ":"",!yon_char_is_empty(password)?password:""," --domain ",target,NULL) +#define kerberos_addition_command(target) yon_char_unite(" --domain_server ",target,"",NULL) +#define dns_addition_command(target) yon_char_unite(" --dns ",target,"",NULL) +#define client_addition_command(target) yon_char_unite(" --domain_client ",target,"",NULL) -#define domain_info(target) yon_char_unite("ubdomain-client discover --domain \"",target,"\"",NULL) +#define domain_info(target) yon_char_unite("ubdomain-client discover --domain ",target,"",NULL) #define domain_connected_icon "com.ublinux.ubl-settings-system.plug-connected-symbolic" #define domain_disconnected_icon "com.ublinux.ubl-settings-system.plug-disconnected-symbolic" -#define domain_connect_check "ubdomain-client list|grep -q \"configured\"" +#define domain_connect_check "ubdomain-client list|grep -q 'configured'" #define domain_check_alive(target) yon_char_unite("timeout --kill-after=0.1 2 dig +time=1 +tries=1 +noall -t SRV _ldap._tcp.",target," @",target," &>/dev/null",NULL) diff --git a/ubl-settings-system-domain-view.glade b/ubl-settings-system-domain-view.glade index 71ebbdf..2d5dd4e 100644 --- a/ubl-settings-system-domain-view.glade +++ b/ubl-settings-system-domain-view.glade @@ -13,6 +13,7 @@ 800 600 False + True com.ublinux.ubl-settings-repomanager From a34788542989013dae2e6738caf719ff34ffac7e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 16:21:24 +0600 Subject: [PATCH 8/9] Debug calls update for new format --- source/ubl-settings-system.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 1b063a5..561d05b 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -464,7 +464,7 @@ domain_info_window *yon_information_window_new(){ yon_gtk_widget_set_scroll_window_for_scroll(window->Window,GTK_SCROLLBAR(window->TerminalScroll)); GdkRGBA rgba; vte_terminal_get_color_background_for_draw(VTE_TERMINAL(window->ExecuteTerminal),&rgba); - // vte_terminal_set_color_cursor(VTE_TERMINAL(window->ExecuteTerminal),&rgba); + vte_terminal_set_color_cursor(VTE_TERMINAL(window->ExecuteTerminal),&rgba); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,TITLE_LABEL,"com.ublinux.ubl-settings-system","InfoWindow"); return window; @@ -488,36 +488,32 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ client = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->ClientCombo)); } char *final = yon_char_unite(!yon_char_is_empty(kerberos)?kerberos_addition_command(kerberos):"",!yon_char_is_empty(kerberos)?" ":"",!yon_char_is_empty(dns)?dns_addition_command(dns):"",!yon_char_is_empty(dns)?" ":"",!yon_char_is_empty(client)?client_addition_command(client):"",!yon_char_is_empty(client)?" ":"",NULL); - yon_debug_output(domain_connect_command(adress,login,password,final)); - yon_debug_output(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final))); + yon_debug_output("%s\n",domain_connect_command(adress,login,password,final)); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final)); gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_connect_command(adress,login,password,final)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } void on_status_clicked(GtkWidget *self, connection_window *window){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(window->AdressEntry)); if (!yon_char_is_empty(target)){ - yon_debug_output(domain_info(target)); + yon_debug_output("%s\n",domain_info(target)); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target)); gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_info(target)),""); } } void on_find_domains_clicked(GtkWidget *self, connection_window *window){ - yon_debug_output(domains_seek_command); + yon_debug_output("%s\n",domains_seek_command); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command); gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domains_seek_command),""); } @@ -525,12 +521,11 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition if (icon_pos==GTK_ENTRY_ICON_SECONDARY&&main_config.domain_connected){ char *target = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->DomainEntry)); if (!yon_char_is_empty(target)){ - yon_debug_output(get_domain_info_command); + yon_debug_output("%s\n",get_domain_info_command); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,get_domain_info_command); gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(widgets->Window)); gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,get_domain_info_command),""); } } } @@ -593,12 +588,11 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ yon_ubl_status_highlight_incorrect(window->AdressEntry); return; } - yon_debug_output(domain_disconnect_command(adress,login,password)); + yon_debug_output("%s\n",domain_disconnect_command(adress,login,password)); domain_info_window *dialog = yon_information_window_new(); yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password)); gtk_window_set_transient_for(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window)); gtk_widget_show(dialog->Window); - // yon_launch_app_with_arguments(terminal_command_start(TITLE_LABEL,domain_disconnect_command(adress,login,password)),""); gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); } From cbb165e0cd62c96a60ca0fe2f7620ef649419dd5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 24 Apr 2024 16:53:25 +0600 Subject: [PATCH 9/9] returned startup checking of domain access --- source/ubl-settings-system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 561d05b..e417a1c 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -573,7 +573,7 @@ connection_window *yon_connection_window_new(){ g_signal_connect(G_OBJECT(window->StatusEntry),"clicked",G_CALLBACK(on_status_clicked),window); g_signal_connect(G_OBJECT(window->FindEntry),"clicked",G_CALLBACK(on_find_domains_clicked),window); g_signal_connect(G_OBJECT(window->AdressEntry),"focus-out-event",G_CALLBACK(yon_update_thread),window); - + yon_update_thread(NULL,NULL,window); return window; }