diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c index f667e90..b385c6e 100644 --- a/source/ubl-settings-services.c +++ b/source/ubl-settings-services.c @@ -209,7 +209,7 @@ void on_config_autostart_clicked(GtkCellRenderer *, char *path, main_window *wid if (status==0){ if (place ==-1){ if (yon_char_parsed_check_exist(parsed,size,unit)==-1){ - if (!yon_config_append("SERVICES_ENABLE",name,",")){ + if (!yon_config_append_element("SERVICES_ENABLE",name,",")){ yon_config_register("SERVICES_ENABLE",SERVICES_ENABLE_get_command,name); } } else { @@ -274,7 +274,7 @@ void on_config_autostop_clicked(GtkCellRenderer *, char *path, main_window *widg if (status==0){ if (place ==-1){ if (yon_char_parsed_check_exist(parsed,size,unit)==-1){ - if (!yon_config_append("SERVICES_DISABLE",name,",")){ + if (!yon_config_append_element("SERVICES_DISABLE",name,",")){ yon_config_register("SERVICES_DISABLE",SERVICES_DISABLE_get_command,name); } } else { @@ -325,7 +325,7 @@ void on_config_block_clicked(GtkCellRenderer *, char *path, main_window *widgets free(unit); unit=parsed_name; gtk_list_store_set(GTK_LIST_STORE(model),&iter,2,!status,-1); - char *config_sting = yon_config_get_by_key("SERVICES_MASK"); + char *config_sting = yon_config_get_by_key(SERVICES_MASK_parameter); int size; config_str parsed = yon_char_parse(config_sting,&size,","); if (strstr(name,".service")){ @@ -337,22 +337,22 @@ void on_config_block_clicked(GtkCellRenderer *, char *path, main_window *widgets if (status==0){ if (place ==-1){ if (yon_char_parsed_check_exist(parsed,size,unit)==-1){ - if (!yon_config_append("SERVICES_MASK",name,",")){ - yon_config_register("SERVICES_MASK",SERVICES_MASK_get_command,name); + if (!yon_config_append_element(SERVICES_MASK_parameter,name,",")){ + yon_config_register(SERVICES_MASK_parameter,SERVICES_MASK_parameter_command,name); } } else { parsed = yon_char_parsed_rip(parsed,&size,place); if (parsed) - yon_config_set("SERVICES_MASK",yon_char_parsed_to_string(parsed,size,",")); - else yon_config_remove_by_key("SERVICES_MASK"); + yon_config_set(SERVICES_MASK_parameter,yon_char_parsed_to_string(parsed,size,",")); + else yon_config_remove_by_key(SERVICES_MASK_parameter); } } } else { if (place !=-1){ parsed = yon_char_parsed_rip(parsed,&size,place); if (parsed) - yon_config_set("SERVICES_MASK",yon_char_parsed_to_string(parsed,size,",")); - else yon_config_remove_by_key("SERVICES_MASK"); + yon_config_set(SERVICES_MASK_parameter,yon_char_parsed_to_string(parsed,size,",")); + else yon_config_remove_by_key(SERVICES_MASK_parameter); } } yon_char_parsed_free(parsed,size); @@ -1308,7 +1308,7 @@ gboolean yon_interface_update_finish(main_window *widgets){ yon_char_parsed_free(parsed,parsed_size); while(gtk_events_pending()) gtk_main_iteration(); - char *masked = yon_config_get_by_key(SERVICES_MASK_PARAMETER); + char *masked = yon_config_get_by_key(SERVICES_MASK_parameter); parsed = yon_char_parse(masked,&parsed_size,","); valid = gtk_tree_model_get_iter_first(model,&iter); for (;valid;valid=gtk_tree_model_iter_next(model,&iter)) @@ -1370,7 +1370,7 @@ gboolean yon_interface_update_finish(main_window *widgets){ yon_char_parsed_free(parsed,parsed_size); while(gtk_events_pending()) gtk_main_iteration(); - char *masked = yon_config_get_by_key(SERVICES_MASK_PARAMETER); + char *masked = yon_config_get_by_key(SERVICES_MASK_parameter); parsed = yon_char_parse(masked,&parsed_size,","); valid = gtk_tree_model_get_iter_first(model,&iter); for (;valid;valid=gtk_tree_model_iter_next(model,&iter)) diff --git a/source/ubl-settings-services.h b/source/ubl-settings-services.h index 3e6b8b7..4f005d3 100644 --- a/source/ubl-settings-services.h +++ b/source/ubl-settings-services.h @@ -131,7 +131,6 @@ #define SERVICES_ENABLE_get_command "ubconfig --source global get [system] SERVICES_ENABLE" #define SERVICES_DISABLE_get_command "ubconfig --source global get [system] SERVICES_DISABLE" -#define SERVICES_MASK_get_command "ubconfig --source global get [system] SERVICES_MASK" #define CONSOLE_FONT_get_command "ubconfig --source global get [locale] CONSOLE_FONT" #define play_icon_path "com.ublinux.ubl-settings-services.play-symbolic" @@ -164,7 +163,8 @@ #define SERVICES_ENABLE_PARAMETER "SERVICES_ENABLE" #define SERVICES_DISABLE_PARAMETER "SERVICES_DISABLE" -#define SERVICES_MASK_PARAMETER "SERVICES_MASK" +#define SERVICES_MASK_parameter "SERVICES_MASK" +#define SERVICES_MASK_parameter_command "ubconfig --source global get [system] SERVICES_MASK" typedef char* string;