# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1131239336 0
# Node ID 831e52ceddf33b5a2ef7438279f27a94fb32c1aa
# Parent  bfbb1798535e9523fde8d436ad26341079e1296e
[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>

diff -r bfbb1798535e -r 831e52ceddf3 src/gtkaccount.c
--- 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);