From 59a0b3cbc601abd4a1292aceaee313d3046aadbc Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 25 Sep 2023 09:16:52 +0600 Subject: [PATCH] added 'Default' option on locale string if absent in config file --- source/ubl-settings-system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c index fb20852..39a76b1 100644 --- a/source/ubl-settings-system.c +++ b/source/ubl-settings-system.c @@ -112,7 +112,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ void yon_config_local_load(GtkWidget *self, main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),""); - gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); int size; GtkTreeIter iter; config_str rtn = yon_config_load(get_id_command,&size); @@ -164,7 +164,7 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){ locale_string = yon_char_unite(strcmp(locale_string,"") ? yon_char_append(locale_string,"; ") : locale_string, loc_name,NULL); } } - gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string); + if (strcmp(locale_string,"")) gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string); } yon_ubl_status_box_render(LOCAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); } @@ -172,7 +172,7 @@ void yon_config_local_load(GtkWidget *self, main_window *widgets){ void yon_config_global_load(GtkWidget *self, main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(widgets->HostnameEntry),""); gtk_entry_set_text(GTK_ENTRY(widgets->IDEntry),""); - gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),""); + gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),DEFAULT_LABEL); int size; GtkTreeIter iter; config_str rtn = yon_config_load(get_id_command,&size); @@ -224,7 +224,7 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){ locale_string = yon_char_unite(strcmp(locale_string,"") ? yon_char_append(locale_string,"; ") : locale_string, loc_name,NULL); } } - gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string); + if (strcmp(locale_string,"")) gtk_entry_set_text(GTK_ENTRY(widgets->LocaleEntry),locale_string); } yon_ubl_status_box_render(GLOBAL_LOAD_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); }