master #119

Merged
asmeron merged 3 commits from YanTheKaller/ubl-settings-usergroups:master into master 2 years ago

@ -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)
@ -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);

Loading…
Cancel
Save