Merge pull request 'Test fix for 'Nothing to save' bug' (#12) from YanTheKaller/libublsettingsui-gtk3:master into master

Reviewed-on: #12
pull/21/head v1.10
Dmitry Razumov 2 years ago
commit 31dbccfc6d

@ -328,7 +328,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
g_signal_connect(G_OBJECT(window->ToggleCell),"toggled", G_CALLBACK(on_save_window_parameter_switched),window); g_signal_connect(G_OBJECT(window->ToggleCell),"toggled", G_CALLBACK(on_save_window_parameter_switched),window);
int config_size=0; int config_size=0;
config_str config_strings = yon_config_get_all(&config_size); config_str config_strings = yon_config_get_all(&config_size);
if (config_strings){ if (config_strings){ //untracked parameters
GtkTreeIter iter; GtkTreeIter iter;
gtk_tree_view_set_model(GTK_TREE_VIEW(window->ParametersTree),NULL); gtk_tree_view_set_model(GTK_TREE_VIEW(window->ParametersTree),NULL);
config_str compare_keys = NULL; config_str compare_keys = NULL;
@ -373,7 +373,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
char *compare_name = yon_char_divide_search(compare_value,"=",-1); char *compare_name = yon_char_divide_search(compare_value,"=",-1);
char *section = yon_config_get_section_for_key(compare_name); char *section = yon_config_get_section_for_key(compare_name);
int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->list),&iter); int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->list),&iter);
for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){ for (;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&iter)){ // found parameter
gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,1,&name,2,&value,-1); gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,1,&name,2,&value,-1);
if (!yon_char_is_empty(name)&&!strcmp(name,config_keys[i])){ if (!yon_char_is_empty(name)&&!strcmp(name,config_keys[i])){
if (!yon_config_check_ignore(name)){ if (!yon_config_check_ignore(name)){
@ -383,7 +383,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
if ((value&&!strcmp(value,compare_value))){ if ((value&&!strcmp(value,compare_value))){
gtk_list_store_set(window->list,&iter,0,0,3,value,5,0,-1); gtk_list_store_set(window->list,&iter,0,0,3,value,5,0,-1);
} else { } else {
if (yon_config_get_status(name)==1){ if (yon_config_get_status(name)!=0){
gtk_list_store_set(window->list,&iter,0,1,5,1,-1); gtk_list_store_set(window->list,&iter,0,1,5,1,-1);
} }
}; };
@ -392,7 +392,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
break; break;
} }
} }
if (!found){ if (!found){ // new parameter
if (!yon_config_check_ignore(compare_name)&&!yon_char_is_empty(compare_value)){ if (!yon_config_check_ignore(compare_name)&&!yon_char_is_empty(compare_value)){
GtkTreeIter itar; GtkTreeIter itar;
gtk_list_store_append(window->list,&itar); gtk_list_store_append(window->list,&itar);

Loading…
Cancel
Save