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 ""