Merge pull request 'master' (#192) from YanTheKaller/ubl-settings-usergroups:master into master

Reviewed-on: #192

source/ubl-settings-usergroups.c

@@ -2108,9 +2108,11 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 
 	int user_shell_active = gtk_combo_box_get_active(GTK_COMBO_BOX(window->userShellCombo));
 	if (user_shell_active>0){
-		user_shell = yon_char_unite("--shell ",(char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->userShellCombo)),NULL);
-		if (!strcmp(user_shell,SET_LABEL)){
-			user_shell = yon_char_unite("--shell ",(char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->userShellCombo)),NULL);
+		char *shell_string = (char*)gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->userShellCombo));
+		if (strcmp(shell_string,SET_LABEL)){
+		user_shell = yon_char_unite("--shell ",shell_string,NULL);
+		} else {
+			user_shell = yon_char_unite("--shell ",(char*)gtk_entry_get_text(GTK_ENTRY(window->userShellEntry)),NULL);
 		} 
 	} else user_shell="";
 
@@ -2722,7 +2724,9 @@ void on_main_edit(GtkWidget *, main_window *widgets){
 				if (size>1){
 					if (strcmp(parsed[1],"")&&strcmp(parsed[1],"x")){
 						gtk_entry_set_text(GTK_ENTRY(window->userUIDEntry),parsed[1]);
+						g_signal_handlers_block_by_func(G_OBJECT(window->userUIDAutoCheck),G_CALLBACK(on_GID_update),window);
 						gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userUIDAutoCheck),0);
+						g_signal_handlers_unblock_by_func(G_OBJECT(window->userUIDAutoCheck),G_CALLBACK(on_GID_update),window);
 						window->last_gid=yon_char_new(parsed[1]);
 					}
 				}