/soc/2013/ankitkv/gobjectification: 535eb3c6eef7: Merged soc.201...

[Ankit Vani]

Changeset: 535eb3c6eef7535a8e2e4b6b4014b7b4f8469e0d
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-02 23:12 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/535eb3c6eef7

Description:

Merged soc.2013.gobjectification branch

diffstat:

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

diffs (28 lines):

diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -376,6 +376,7 @@ purple_account_disconnect(PurpleAccount 
 	const char *username;
 
 	g_return_if_fail(PURPLE_IS_ACCOUNT(account));
+	g_return_if_fail(!purple_account_is_disconnecting(account));
 	g_return_if_fail(!purple_account_is_disconnected(account));
 
 	priv = PURPLE_ACCOUNT_GET_PRIVATE(account);
diff --git a/libpurple/connection.c b/libpurple/connection.c
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -718,11 +718,11 @@ purple_connection_finalize(GObject *obje
 
 	update_keepalive(gc, FALSE);
 
+	purple_protocol_class_close(priv->protocol, gc);
+
 	purple_http_conn_cancel_all(gc);
 	purple_proxy_connect_cancel_with_handle(gc);
 
-	purple_protocol_class_close(priv->protocol, 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) {