/pidgin/main: ed1b60bdd439: Bugfix: after checking and un-checki...

[Tomasz Wasilczyk]

Changeset: ed1b60bdd439985bb90c2da29fce8ad3971c8e89
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-07-08 12:36 +0200
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/ed1b60bdd439

Description:

Bugfix: after checking and un-checking registration box in account setup dialog with username empty and login_label active, OK button was still active

diffstat:

 pidgin/gtkaccount.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (25 lines):

diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -344,9 +344,11 @@
 		(dialog->prpl_info->options & OPT_PROTO_REGISTER_NOSCREENNAME));
 	int register_noscreenname = (opt_noscreenname && register_checked);
 	
+	// get rid of login_label in username field
+	username_focus_cb(dialog->username_entry, NULL, dialog);
+	
 	if (register_noscreenname) {
 		gtk_entry_set_text(GTK_ENTRY(dialog->username_entry), "");
-		username_nofocus_cb(dialog->username_entry, NULL, dialog);
 		gtk_entry_set_text(GTK_ENTRY(dialog->password_entry), "");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check), FALSE);
 	}
@@ -360,6 +362,8 @@
 			*gtk_entry_get_text(GTK_ENTRY(dialog->username_entry))
 				!= '\0');
 	}
+	
+	username_nofocus_cb(dialog->username_entry, NULL, dialog);
 }
 
 static void