# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1274343260 0
# Node ID 5044315e81e1203f801801c729c309e77b2b177d
# Parent  dbe96260108c6a7154ddbf1395726b31afdd0174
Wait, command can't be both INVITE and CANCEL at the same time.

diff -r dbe96260108c -r 5044315e81e1 libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c	Tue May 18 06:36:35 2010 +0000
+++ b/libpurple/protocols/msn/msg.c	Thu May 20 08:14:20 2010 +0000
@@ -1150,15 +1150,8 @@
 		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_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.