Mercurial > pidgin

changeset 12555:8427ef2b4138

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14874] Fix a crash reported in bug #1384554. Fix another bug in the accounts window username greying-out code that I introduced when I changed Sadrul's patch to use the signing-on signal instead of the signed-on signal. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Mon, 19 Dec 2005 08:29:34 +0000
parents 9d9030dfd689
children 14e094d7568f
files src/gtkaccount.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkaccount.c	Mon Dec 19 06:01:42 2005 +0000
+++ b/src/gtkaccount.c	Mon Dec 19 08:29:34 2005 +0000
@@ -717,7 +717,7 @@
 	if (gc != NULL && dialog->account != gaim_connection_get_account(gc))
 		return;
 
-	set = !gaim_account_is_connected(dialog->account);
+	set = !(gaim_account_is_connected(dialog->account) || gaim_account_is_connecting(dialog->account));
 	gtk_widget_set_sensitive(dialog->protocol_menu, set);
 	gtk_widget_set_sensitive(dialog->screenname_entry, set);
 
@@ -766,9 +766,6 @@
 	g_signal_connect(G_OBJECT(dialog->screenname_entry), "changed",
 					 G_CALLBACK(screenname_changed_cb), dialog);
 
-	/* Do not let the user change the protocol/screenname while connected. */
-	update_editable(NULL, dialog);
-
 	/* Do the user split thang */
 	if (dialog->plugin == NULL) /* Yeah right. */
 		user_splits = NULL;
@@ -876,6 +873,8 @@
 		gtk_widget_hide(dialog->remember_pass_check);
 	}
 
+	/* Do not let the user change the protocol/screenname while connected. */
+	update_editable(NULL, dialog);
 	gaim_signal_connect(gaim_connections_get_handle(), "signing-on", dialog,
 					G_CALLBACK(update_editable), dialog);
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-off", dialog,