[gaim-migrate @ 16810]

Thu, 17 Aug 2006 06:21:28 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Thu, 17 Aug 2006 06:21:28 +0000
changeset 14224
d6d41ff969df
parent 14223
c6ba4f3482de
child 14225
35fa1f6160b4

[gaim-migrate @ 16810]
sf patch #1541754, from Sadrul Habib Chowdhury
"Setting an account to 'offline' while it is connecting
doesn't cause the connection to stop. This patch fixes
that."

committer: Mark Doliner <markdoliner@pidgin.im>

src/prpl.c file | annotate | diff | comparison | revisions
--- a/src/prpl.c	Thu Aug 17 05:47:58 2006 +0000
+++ b/src/prpl.c	Thu Aug 17 06:21:28 2006 +0000
@@ -171,6 +171,12 @@
 		return;
 	}
 
+	if (!gaim_status_is_online(new_status))
+	{
+		if (!gaim_account_is_disconnected(account))
+			gaim_account_disconnect(account);
+		return;
+	}
 
 	if (gaim_account_is_connecting(account))
 		/*
@@ -191,13 +197,6 @@
 	{
 		prpl_info->set_status(account, new_status);
 	}
-
-	if (!gaim_status_is_online(new_status))
-	{
-		if (!gaim_account_is_disconnected(account))
-			gaim_account_disconnect(account);
-		return;
-	}
 }
 
 void

mercurial