# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1132099283 0
# Node ID 1d4fbf553ce2f3301ec0867877a59ffdcf100dfc
# Parent  40724851e95e6e42926478b5699f1776fa955080
[gaim-migrate @ 14408]
A patch from Sadrul
"when you set an account to offline while it is "connecting", it
doesn't disconnect. marv hit on this last night"

committer: Tailor Script <tailor@pidgin.im>

diff -r 40724851e95e -r 1d4fbf553ce2 src/prpl.c
--- a/src/prpl.c	Tue Nov 15 20:51:58 2005 +0000
+++ b/src/prpl.c	Wed Nov 16 00:01:23 2005 +0000
@@ -289,14 +289,6 @@
 	g_return_if_fail(old_status != NULL);
 	g_return_if_fail(new_status != NULL);
 
-	if (gaim_account_is_connecting(account))
-		/*
-		 * We don't need to call the set_status PRPL function because
-		 * the PRPL will take care of setting its status during the
-		 * connection process.
-		 */
-		return;
-
 	if (gaim_status_is_online(new_status) &&
 		gaim_account_is_disconnected(account))
 	{
@@ -311,6 +303,14 @@
 		return;
 	}
 
+	if (gaim_account_is_connecting(account))
+		/*
+		 * We don't need to call the set_status PRPL function because
+		 * the PRPL will take care of setting its status during the
+		 * connection process.
+		 */
+		return;
+
 	prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	if (prpl == NULL)