pidgin: 0064098d: Wait, command can't be both INVITE and C...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 0064098d5f2b1cf6e031193f37ab107e30af1044
Ancestor: e3e068c14157c92fee76edb303d01dece47fee1d
Author: qulogic at pidgin.im
Date: 2010-05-20T08:14:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0064098d5f2b1cf6e031193f37ab107e30af1044

Modified files:
        libpurple/protocols/msn/msg.c

ChangeLog: 

Wait, command can't be both INVITE and CANCEL at the same time.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msg.c	66d7082c41afea79e7cb7180ad6f082e1108862f
+++ libpurple/protocols/msn/msg.c	dc2729e8a7c8eece16f25fb64d605b501a127ea4
@@ -1150,15 +1150,8 @@ msn_invite_msg(MsnCmdProc *cmdproc, MsnM
 		const gchar	*guid = g_hash_table_lookup(body, "Application-GUID");
 	
 		if (guid == NULL) {
-			if (!strcmp(command, "CANCEL")) {
-				const gchar *code = g_hash_table_lookup(
-						body, "Cancel-Code");
-				purple_debug_info("msn",
-						"MSMSGS invitation cancelled: %s.\n",
-						code ? code : "no reason given");
-			} else
-				purple_debug_warning("msn",
-				                     "Invite msg missing Application-GUID.\n");
+			purple_debug_warning("msn",
+			                     "Invite msg missing Application-GUID.\n");
 
 			accepted = TRUE;
 
@@ -1216,6 +1209,11 @@ msn_invite_msg(MsnCmdProc *cmdproc, MsnM
 			msn_message_destroy(cancel);
 		}
 
+	} else if (!strcmp(command, "CANCEL")) {
+		const gchar *code = g_hash_table_lookup(body, "Cancel-Code");
+		purple_debug_info("msn", "MSMSGS invitation cancelled: %s.\n",
+		                  code ? code : "no reason given");
+
 	} else {
 		/*
 		 * Some other already established invitation session.