From 611b0adef4810eadee20f3910af8b56b14347127 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 10:55:57 +0600 Subject: [PATCH 1/3] Test fix for freeze --- 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 5888106..2d416e0 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -581,7 +581,7 @@ connection_window *yon_connection_window_new(){ g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); 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); - window->timer_id = g_timeout_add(1000,(GSourceFunc)on_main_window_domain_status_update,window); + window->timer_id = g_timeout_add(1000,(GSourceFunc)yon_update_thread,window); return window; } From 97a8081e6caffb00a04c55e8f25d765fa2426305 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 11:12:10 +0600 Subject: [PATCH 2/3] changed command to make less bash calls --- source/ubl-settings-system.c | 10 +++++----- source/ubl-settings-system.h | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 2d416e0..3f9e948 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -43,7 +43,7 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); int size; GtkTreeIter iter; - config_str rtn = yon_config_load(get_id_command,&size); + config_str rtn = yon_file_open(get_id_command,&size); rtn[0]=yon_char_divide_search(rtn[0],"\n",-1); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); @@ -117,7 +117,7 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); int size; GtkTreeIter iter; - config_str rtn = yon_config_load(get_id_command,&size); + config_str rtn = yon_file_open(get_id_command,&size); rtn[0]=yon_char_divide_search(rtn[0],"\n",-1); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); @@ -203,7 +203,7 @@ void yon_config_custom_load(GtkWidget *self, main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); int size; GtkTreeIter iter; - config_str rtn = yon_config_load(get_id_command,&size); + config_str rtn = yon_file_open(get_id_command,&size); rtn[0]=yon_char_divide_search(rtn[0],"\n",-1); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),*rtn); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); @@ -773,7 +773,7 @@ main_window *yon_main_window_complete(main_window *widgets){ main_config.localeslist = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_BOOLEAN); int size; - config_str locales = yon_config_load(get_locales_command,&size); + config_str locales = yon_file_open(get_locales_command,&size); GtkTreeIter iter; for (int i=0;ilanguagelist,&iter); gtk_list_store_set(widgets->languagelist,&iter,0,_(loc_parsed[1]),1,loc_parsed[0],2,0,-1); } - config_str fonts = yon_config_load(get_fonts_command,&size); + config_str fonts = yon_file_open(get_fonts_command,&size); for (int i=0;ifontlist,&iter); diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h index 3b16616..3b2e617 100644 --- a/source/ubl-settings-system.h +++ b/source/ubl-settings-system.h @@ -36,10 +36,9 @@ #define config_global_load_command "ubconfig --source global get " #define config_local_load_command "ubconfig --source system get " -#define get_locales_command "grep '' /usr/share/ubl-settings-system/csv/locales.csv" -#define get_fonts_command "grep '' /usr/share/ubl-settings-system/csv/fonts.csv" -#define get_id_command "grep '' /etc/machine-id" -// #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'" +#define get_locales_command "/usr/share/ubl-settings-system/csv/locales.csv" +#define get_fonts_command "/usr/share/ubl-settings-system/csv/fonts.csv" +#define get_id_command "/etc/machine-id" #define config_get_command(source) yon_char_unite("ubconfig --source ", source, " get system HOSTNAME MACHINEID",NULL), yon_char_unite("ubconfig --source ", source, " get locale CONSOLE_FONT LOCALE LANG",NULL), yon_char_unite("ubconfig --source ", source, " get [network] DOMAIN DOMAIN[admanger] DOMAIN[server] DOMAIN[dns] DOMAIN[client]",NULL) #define config_get_default_command "" From aef71eea8f6a06d6d1e7a97d96f66ac442e238af Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 11:56:32 +0600 Subject: [PATCH 3/3] test output increased --- source/ubl-settings-system.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index 3f9e948..1a3bd02 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -497,10 +497,12 @@ void on_domain_connect(GtkWidget *self, dictionary *dict){ yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_connect_command(adress,login,password,final),NULL,NULL); if (main_config.debug_mode){ printf("%s\n",domain_connect_command(adress,login,password,final)); + int size_; + config_str test = yon_config_load(domain_connect_command(adress,login,password,final),&size_); + printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); } gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); gtk_widget_show(dialog->Window); - on_subwindow_close(window->Window); } void on_status_clicked(GtkWidget *self, connection_window *window){ @@ -510,6 +512,9 @@ void on_status_clicked(GtkWidget *self, connection_window *window){ yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_info(target),NULL,NULL); if (main_config.debug_mode){ printf("%s\n",domain_info(target)); + int size_; + config_str test = yon_config_load(domain_info(target),&size_); + printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); } } gtk_widget_show(dialog->Window); @@ -520,6 +525,9 @@ void on_find_domains_clicked(GtkWidget *self, connection_window *window){ yon_terminal_integrated_start(dialog->ExecuteTerminal,domains_seek_command,NULL,NULL); if (main_config.debug_mode){ printf("%s\n",domains_seek_command); + int size_; + config_str test = yon_config_load(domains_seek_command,&size_); + printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); } gtk_widget_show(dialog->Window); } @@ -534,6 +542,9 @@ void on_main_window_domain_status_clicked(GtkWidget *self, GtkEntryIconPosition yon_terminal_integrated_start(window->ExecuteTerminal,get_domain_info_command,NULL,NULL); if (main_config.debug_mode){ printf("%s\n",get_domain_info_command); + int size_; + config_str test = yon_config_load(get_domain_info_command,&size_); + printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); } } } @@ -604,6 +615,9 @@ void on_domain_disconnect(GtkWidget *self, dictionary *dict){ yon_terminal_integrated_start(dialog->ExecuteTerminal,domain_disconnect_command(adress,login,password),NULL,NULL); if (main_config.debug_mode){ printf("%s\n",domain_disconnect_command(adress,login,password)); + int size_; + config_str test = yon_config_load(domain_disconnect_command(adress,login,password),&size_); + printf("%s\n",yon_char_parsed_to_string(test,size_,"\n")); } gtk_entry_set_text(GTK_ENTRY(widgets->DomainEntry),adress); on_subwindow_close(window->Window);