From 79c6053f389fdc320366ecd51033999ff2da5590 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 26 Feb 2025 16:44:36 +0600 Subject: [PATCH] Fixed shutdown@all always on --- source/ubl-settings-usergroups-settings.c | 8 ++----- ...tings-usergroups-additional-settings.glade | 24 +++++++++---------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/source/ubl-settings-usergroups-settings.c b/source/ubl-settings-usergroups-settings.c index f402ce8..b4a3cd5 100644 --- a/source/ubl-settings-usergroups-settings.c +++ b/source/ubl-settings-usergroups-settings.c @@ -287,10 +287,10 @@ void on_useradd_sync_changed(ubl_settings_usergroups_additional_settings_window } char *groupadd_sync = ""; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsersBootCheck))){ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsBootCheck))){ groupadd_sync = yon_char_new("boot"); } - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UsersShutdownCheck))){ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->GroupsShutdownCheck))){ char *temp = yon_char_unite(groupadd_sync,!yon_char_is_empty(groupadd_sync)?",":"","shutdown",NULL); if(!yon_char_is_empty(groupadd_sync)) free(groupadd_sync); groupadd_sync = temp; @@ -417,8 +417,6 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ } 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_expander_set_expanded(GTK_EXPANDER(window->UsersShutdownExpander),0); - gtk_revealer_set_reveal_child(GTK_REVEALER(window->UserShutdownRevealer),0); } 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); @@ -498,8 +496,6 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_ } else if (!strcmp(parsed[i],"shutdown@all")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,1,-1); - gtk_expander_set_expanded(GTK_EXPANDER(window->GroupsShutdownExpander),0); - gtk_revealer_set_reveal_child(GTK_REVEALER(window->GroupShutdownRevealer),0); } else if (!strcmp(parsed[i],"shutdown@users")){ gtk_tree_model_get_iter_first(model,&iter); gtk_list_store_set(window->GroupsShutdownList,&iter,0,0,-1); diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade index 96723ce..db39dfe 100644 --- a/ubl-settings-usergroups-additional-settings.glade +++ b/ubl-settings-usergroups-additional-settings.glade @@ -32,13 +32,13 @@ - True + False All groups in system 1 65535 True True - True + False False False shutdown@all @@ -51,7 +51,7 @@ 1000 6000 True - False + True False False False @@ -65,7 +65,7 @@ 500 999 True - False + True False False False @@ -79,7 +79,7 @@ True - False + True False True True @@ -93,7 +93,7 @@ True - False + True False True False @@ -132,13 +132,13 @@ - True + False All system users 1 65535 True True - True + False False False shutdown@all @@ -151,7 +151,7 @@ 1000 6000 True - False + True False False False @@ -165,7 +165,7 @@ 500 999 True - False + True False False False @@ -179,7 +179,7 @@ True - False + True False True True @@ -193,7 +193,7 @@ True - False + True False True False