/soc/2013/ankitkv/gobjectification: 79d57b15c8cc: Merged soc.201...

[Ankit Vani]

Changeset: 79d57b15c8cc9a62feb1292998ed1ec4394c27b0
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-03 06:47 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/79d57b15c8cc

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/connection.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff --git a/libpurple/connection.c b/libpurple/connection.c
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -720,9 +720,6 @@ purple_connection_finalize(GObject *obje
 
 	purple_protocol_class_close(priv->protocol, gc);
 
-	purple_http_conn_cancel_all(gc);
-	purple_proxy_connect_cancel_with_handle(gc);
-
 	/* Clear out the proto data that was freed in the protocol's close method */
 	buddies = purple_blist_find_buddies(account, NULL);
 	while (buddies != NULL) {
@@ -731,6 +728,9 @@ purple_connection_finalize(GObject *obje
 		buddies = g_slist_delete_link(buddies, buddies);
 	}
 
+	purple_http_conn_cancel_all(gc);
+	purple_proxy_connect_cancel_with_handle(gc);
+
 	connections = g_list_remove(connections, gc);
 
 	purple_connection_set_state(gc, PURPLE_CONNECTION_DISCONNECTED);