Mercurial > pidgin
diff libpurple/protocols/msn/msg.c @ 30069:5044315e81e1
Wait, command can't be both INVITE and CANCEL at the same time.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Thu, 20 May 2010 08:14:20 +0000 |
| parents | 3f6daa187665 |
| children | 66e7fe9f7810 |
line wrap: on
line diff
--- 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.