source/ubl-settings-system.c

@@ -158,7 +158,7 @@ void yon_interface_update(main_window *widgets){
     gboolean is_active;
     char *locale_string="";
     char *loc_name;
-    if (lang){
+    if (!yon_char_is_empty(avlocale)){
         int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
         for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
             gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,0,&loc_name,1,&code,2,&is_active,-1);
@@ -170,7 +170,7 @@ void yon_interface_update(main_window *widgets){
                     }
                 }
             }
-            if (code&&!strcmp(code,lang)) {
+            if (!yon_char_is_empty(lang)&&!yon_char_is_empty(code)&&!strcmp(code,lang)) {
                 GtkTreeIter filter_iter;
                 gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(main_config.localefilter));
                 while(gtk_events_pending()) gtk_main_iteration();

source/ubl-settings-system.h

@@ -40,7 +40,7 @@
 #define get_fonts_command "resource:///com/ublinux/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_command(source) yon_char_unite("ubconfig --source ", source, " -ea get system HOSTNAME MACHINEID -- get locale CONSOLE_FONT LOCALE LANG -- get [network] DOMAIN DOMAIN[admanger] DOMAIN[server] DOMAIN[dns] DOMAIN[client]",NULL)
 #define config_get_default_command ""
 
 #define config_get_global_only_parameters ""