# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1147031102 0
# Node ID 0ab02f082333a029bf127149977351702ebef029
# Parent  79720436df404f3646bc751a1f83f649ce94ff88
[gaim-migrate @ 16144]
Disconnect an account before removing it from our list of accounts.
This gets rid of an assertion failure when deleting an online
account

committer: Tailor Script <tailor@pidgin.im>

diff -r 79720436df40 -r 0ab02f082333 src/account.c
--- a/src/account.c	Sun May 07 18:28:32 2006 +0000
+++ b/src/account.c	Sun May 07 19:45:02 2006 +0000
@@ -865,11 +865,6 @@
 
 	gaim_debug_info("account", "Destroying account %p\n", account);
 
-	if (gaim_account_is_connected(account))
-		gaim_account_disconnect(account);
-
-	gaim_debug_info("account", "Continuing to destroy account %p\n", account);
-
 	for (l = gaim_get_conversations(); l != NULL; l = l->next)
 	{
 		GaimConversation *conv = (GaimConversation *)l->data;
@@ -2132,6 +2127,9 @@
 
 	g_return_if_fail(account != NULL);
 
+	if (gaim_account_is_connected(account))
+		gaim_account_disconnect(account);
+
 	gaim_notify_close_with_handle(account);
 	gaim_request_close_with_handle(account);