From 3f4b2ac1c769a311032ac085644d3d2c262b53cb Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 17:37:01 +0600 Subject: [PATCH] Additional settings shutdown fixes --- source/ubl-settings-usergroups-settings.c | 29 ++++++++++--------- ...tings-usergroups-additional-settings.glade | 16 +++++----- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/source/ubl-settings-usergroups-settings.c b/source/ubl-settings-usergroups-settings.c index b4a3cd5..6d4dc33 100644 --- a/source/ubl-settings-usergroups-settings.c +++ b/source/ubl-settings-usergroups-settings.c @@ -322,7 +322,7 @@ void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window if(!yon_char_is_empty(groupadd_sync)) free(groupadd_sync); groupadd_sync = temp; - } else if (!strcmp(parameter,"shutdown@uid")){ + } else if (!strcmp(parameter,"shutdown@gid")){ char *temp = yon_char_unite(groupadd_sync,!yon_char_is_empty(groupadd_sync)?",":"","shutdown@",min_str,NULL); if(!yon_char_is_empty(groupadd_sync)) free(groupadd_sync); groupadd_sync = temp; @@ -416,21 +416,22 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck),1); } else if (!strcmp(parsed[i],"shutdown@all")){ gtk_tree_model_get_iter_first(model,&iter); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,7,0,8,0,-1); } else if (!strcmp(parsed[i],"shutdown@users")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,0,5,0,6,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,0,8,0,-1); } else if (!strcmp(parsed[i],"shutdown@systems")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,0,5,0,6,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,0,8,0,-1); } else if (strstr(parsed[i],"-")){ - on_additional_settings_cell_toggled(window->UserActiveCell,"0",window); + gtk_tree_model_get_iter_first(model,&iter); + gtk_list_store_set(window->UsersShutdownList,&iter,0,0,5,0,6,0,-1); if (!maxmin_set){ gtk_tree_model_get_iter_from_string(model,&iter,"3"); maxmin_set++; @@ -463,9 +464,9 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->UsersShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,-1); } } @@ -500,13 +501,13 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,5,1,6,1,-1); } else if (!strcmp(parsed[i],"shutdown@systems")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,5,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,5,1,6,1,-1); } else if (strstr(parsed[i],"-")){ gtk_tree_model_get_iter_first(model,&iter); @@ -516,7 +517,7 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ maxmin_set++; } else { gtk_list_store_append(window->GroupsShutdownList,&iter); - gtk_list_store_set(window->GroupsShutdownList,&iter,1,SHUTDOWN_GID_RANGE_LABEL,5,1,6,1,7,1,8,1,9,"shutdown@uid",10,1,11,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,1,SHUTDOWN_GID_RANGE_LABEL,5,1,6,1,9,"shutdown@uid",10,1,11,1,-1); } char *temp = yon_char_new(parsed[i]); @@ -534,18 +535,18 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ uid_set++; } else { gtk_list_store_append(window->GroupsShutdownList,&iter); - gtk_list_store_set(window->GroupsShutdownList,&iter,1,SHUTDOWN_GID_LABEL,5,1,6,1,7,1,8,0,9,"shutdown@uid",10,1,11,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,1,SHUTDOWN_GID_LABEL,5,1,6,1,7,1,8,1,9,"shutdown@uid",10,1,11,1,-1); } char *temp = yon_char_new(parsed[i]); free(yon_char_divide_search(temp,"@",-1)); - gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,2,temp,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,2,temp,5,1,6,1,-1); } else if (!strcmp(parsed[i],"shutdown")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); gtk_tree_model_get_iter_from_string(model,&iter,"1"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,6,1,-1); gtk_tree_model_get_iter_from_string(model,&iter,"2"); - gtk_list_store_set(window->UsersShutdownList,&iter,0,1,6,1,7,1,8,1,-1); + gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,6,1,-1); } } diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade index db39dfe..6772a79 100644 --- a/ubl-settings-usergroups-additional-settings.glade +++ b/ubl-settings-usergroups-additional-settings.glade @@ -76,8 +76,8 @@ False Group GID range - - + + True True False @@ -90,8 +90,8 @@ False Group GID in system - - + + True True False @@ -176,8 +176,8 @@ False Users UID range - - + + True True False @@ -190,8 +190,8 @@ False User UID in system - - + + True True False