From 4ee7565aefae57e637e988657a75e286d6a939b0 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 12 Mar 2024 16:34:40 +0600 Subject: [PATCH] Global and local config saving fixes --- source/ubl-settings-usergroups.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index a46c259..b0a7c37 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -146,9 +146,9 @@ void yon_interface_update(main_window *widgets){ } if (!strcmp(parameters[1],"x")) parameters[1]=""; char *pars=""; - if (parameters_size>3&&strcmp(parameters[3],"x")&&strcmp(parameters[3],"")){ + if (parameters_size>4&&strcmp(parameters[4],"x")&&strcmp(parameters[4],"")){ - if (!check_is_password_hash(parameters[3])&¶meters[5][0]!='%'&¶meters[5][1]!='%'){ + if (!check_is_password_hash(parameters[4])&¶meters[4][0]!='%'&¶meters[4][1]!='%'){ pars = ENCRYPTED_LABEL; } else { pars = UNENCRYPTED_LABEL; @@ -180,10 +180,6 @@ void yon_interface_update(main_window *widgets){ } } -void on_save_window_close_update(GtkWidget *self, main_window *widgets){ - yon_interface_update(widgets); -} - void on_config_local_load(GtkWidget *self, main_window *widgets){ yon_load_proceed(YON_CONFIG_LOCAL); textdomain(template_ui_LocaleName); @@ -456,10 +452,8 @@ void on_config_save(GtkWidget *self, main_window *widgets){ } } } - } else { - yon_hide_passwords(window); - g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets); } + yon_hide_passwords(window); } } @@ -499,7 +493,6 @@ void on_config_local_save(GtkWidget *self, main_window *widgets){ template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,config_get_command("system"),NULL); if (window){ yon_hide_passwords(window); - g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_save_window_close_update),widgets); } for (int i=0;i