[Gaim-commits] SF.net SVN: gaim: [16144] trunk/src/account.c

[<the...@us...>]

Revision: 16144
Author:   thekingant
Date:     2006-05-07 12:45:02 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16144&view=rev

Log Message:
-----------
Disconnect an account before removing it from our list of accounts.
This gets rid of an assertion failure when deleting an online
account

Modified Paths:
--------------
    trunk/src/account.c
Modified: trunk/src/account.c
===================================================================
--- trunk/src/account.c	2006-05-07 18:28:32 UTC (rev 16143)
+++ trunk/src/account.c	2006-05-07 19:45:02 UTC (rev 16144)
@@ -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);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.