# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1116464625 0
# Node ID 3ad0e7351826675379eefde4d06513bbd28f56dc
# Parent  ceb88f2a2f17eecd2cc5c852278d903217836bb3
[gaim-migrate @ 12711]
This is a bit better, but needs work. Don't sign on accounts just because
you modified them. This should be adapted to use the currently active
status sometime.

committer: Tailor Script <tailor@pidgin.im>

diff -r ceb88f2a2f17 -r 3ad0e7351826 src/gtkaccount.c
--- a/src/gtkaccount.c	Thu May 19 00:50:06 2005 +0000
+++ b/src/gtkaccount.c	Thu May 19 01:03:45 2005 +0000
@@ -1348,6 +1348,7 @@
 	char *username;
 	char *tmp;
 	size_t index;
+	gboolean new = FALSE;
 	GtkTreeIter iter;
 	GaimAccount *ret;
 
@@ -1359,6 +1360,7 @@
 
 		dialog->account = gaim_account_new(screenname, dialog->protocol_id);
 		gaim_account_set_enabled(dialog->account, GAIM_GTK_UI, TRUE);
+		new = TRUE;
 	}
 	else
 	{
@@ -1538,13 +1540,17 @@
 		}
 	}
 
-	gaim_presence_set_status_active(dialog->account->presence, "online", TRUE);
 	ret = dialog->account;
 
 	account_win_destroy_cb(NULL, NULL, dialog);
 
 	gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", ret);
 
+	/* XXX: make the new account sign on with the currently active global status
+	 * instead of hardcoding "online" */
+	if (new)
+		gaim_presence_set_status_active(dialog->account->presence, "online", TRUE);
+
 	return ret;
 }