changeset 11987:831e52ceddf3

[gaim-migrate @ 14280] When adding a new account, don't attempt to sign on before we set the password on the account. I don't know if I'll get a chance to fix oscar sign-on-as-away tonight. I'm not sure when I broke that. I'm not sure Gaim is quite in a state to release tomorrow... committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 06 Nov 2005 01:08:56 +0000
parents bfbb1798535e
children 9ccbd9f8e8c6
files src/gtkaccount.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkaccount.c	Sat Nov 05 23:42:35 2005 +0000
+++ b/src/gtkaccount.c	Sun Nov 06 01:08:56 2005 +0000
@@ -1437,7 +1437,6 @@
 
 		screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry));
 		account = gaim_account_new(screenname, dialog->protocol_id);
-		gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
 		new = TRUE;
 	}
 	else
@@ -1615,10 +1614,12 @@
 	else
 		gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account);
 
+	/* If this is a new account, then sign on! */
 	if (new) {
 		const char *current_savedstatus_name;
 		const GaimSavedStatus *saved_status;
 
+		gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
 		current_savedstatus_name = gaim_prefs_get_string("/core/status/current");
 		saved_status = gaim_savedstatus_find(current_savedstatus_name);
 		gaim_savedstatus_activate_for_account(saved_status, account);