From 0ba58746e6e9fe8032550ef3d8c34ed43f2e9039 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 20 Feb 2024 12:04:03 +0600 Subject: [PATCH 1/3] Fixed additional parameter section --- source/ubl-settings-usergroups.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 3a863b0..a4dbc74 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1647,8 +1647,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){ ":",yon_char_return_if_exist(uid_string,"x"), ":",yon_char_return_if_exist(main_group,"x"), ":",yon_char_return_if_exist(additional_groups,"x"), - !yon_char_is_empty(extra_options)?" ":"", - yon_char_return_if_exist(extra_options,""), + ":",yon_char_return_if_exist(extra_options,""), ":",yon_char_return_if_exist(password,""), NULL); -- 2.35.1 From 0241876d02087d2a6edf03f18c26c1c80f53c580 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 20 Feb 2024 12:12:25 +0600 Subject: [PATCH 2/3] Removed space --- source/ubl-settings-usergroups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index a4dbc74..970259e 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1769,7 +1769,7 @@ void on_parameter_changed(GtkWidget *self,ubl_settings_usergroups_user_window *w int do_not_check_actve = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->userDontCheckCheck)); if (do_not_check_actve) - do_not_check = " --badnames"; + do_not_check = "--badnames"; login = (char*)gtk_entry_get_text(GTK_ENTRY(window->userLoginEntry)); if (login[0]>'0'&&login[0]<'9'&&!do_not_check_actve){ -- 2.35.1 From 811677315aeef9b38305f92d15bdb3cd3ad63860 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 20 Feb 2024 16:41:19 +0600 Subject: [PATCH 3/3] Applied 'x' symbol filter for additional parameters column --- source/ubl-settings-usergroups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 970259e..241331c 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -93,7 +93,7 @@ void yon_interface_update(main_window *widgets){ 1,parameters_size>1&&!yon_char_is_empty(parameters[1])?parameters[1]:AUTOMATICALLY_LABEL, 4,parameters_size>2&&!yon_char_is_empty(parameters[2])?parameters[2]:login, 5,parameters_size>3?!strcmp(parameters[3],"x")||!strcmp(parameters[3],"")?def_groups:parameters[3]:def_groups, - 6,parameters_size>4?parameters[4]:"", + 6,parameters_size>4?!strcmp(parameters[3],"x")?"":parameters[4]:"", 7,pars, -1); if(parameters) -- 2.35.1