[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.361,1.362

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26680

Modified Files:
	msn.c 
Log Message:
Apparently not being able to disconnect MSN by unchecking "enabled" in
the accounts window is a *High* priority bug (garybugsxmlnumber27).
Now it's a zero priority bug, because this fixes it.



Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -d -p -r1.361 -r1.362
--- msn.c	14 May 2005 14:40:57 -0000	1.361
+++ msn.c	25 Jun 2005 18:18:24 -0000	1.362
@@ -827,14 +827,18 @@ msn_set_status(GaimAccount *account, Gai
 
 	gc = gaim_account_get_connection(account);
 
-	if (gc) 
+	if (gc != NULL)
 		session = gc->proto_data;
 
 	state = gaim_status_get_id(status);
 
 	gaim_debug_info("msn", "Set status to %s\n", gaim_status_get_name(status));
 
-	if (strcmp(state, "offline") && !gc) {
+	if (!strcmp(state, "offline") && (gc != NULL)) {
+		gaim_account_disconnect(account);
+		return;
+	}
+	else if (strcmp(state, "offline") && (gc == NULL)) {
 		gaim_account_connect(account);
 		return;
 	}