diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 7d8a834..cdf2d22 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1252,9 +1252,8 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry), name); gtk_entry_set_text(GTK_ENTRY(window->userUserNameEntry), parsed_size>0?parameters[0]:""); if (parsed_size>1){ - if (!strcmp(parameters[1],"x")) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userUIDAutoCheck),1); - else + if (strcmp(parameters[1],"x")) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userUIDAutoCheck),0); gtk_entry_set_text(GTK_ENTRY(window->userUIDEntry), parsed_size>1?parameters[1]:""); } if (parsed_size>2){ @@ -1263,7 +1262,11 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ else gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry), parsed_size>2?parameters[2]:""); } - gtk_entry_set_text(GTK_ENTRY(window->userAdditionalGroupsEntry), parsed_size>3?parameters[3]:""); + if (parsed_size>3){ + if (strcmp(parameters[3],"x")) + gtk_entry_set_text(GTK_ENTRY(window->userAdditionalGroupsEntry), parsed_size>3?parameters[3]:""); + + } if (parsed_size>4&&!yon_char_is_empty(parameters[4])){ int params_size; config_str parameters_substring = yon_char_parse(parameters[4],¶ms_size," "); @@ -1297,7 +1300,13 @@ void on_main_edit(GtkWidget *self, main_window *widgets){ // gtk_entry_set_text(GTK_ENTRY(window->), parsed_size>4?parameters[4]:""); } window->old_password=parameters[5]; - gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry), parsed_size>5?parameters[5]:""); + if(parsed_size>5){ + if (strcmp(parameters[5],"x")){ + gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry), parsed_size>5?parameters[5]:""); + gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),3); + } + + } free(parameters); parameters=yon_char_parse(yon_config_get_by_key(USERSHADOW(name)),&parsed_size,":"); gtk_entry_set_text(GTK_ENTRY(window->userPasswordChangedEntry),parsed_size>0?parameters[0]:"");