Changeset 0fb32dd for protocols/msn/sb.c

Timestamp:

2015-04-06T17:07:03Z (10 years ago)

Author:

dequis <dx@…>

Children:

1aacef41

Parents:

b3ebb3a (diff), a9b1e0e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc.h
irc_channel.c

File:

• protocols/msn/sb.c (modified) (3 diffs)

protocols/msn/sb.c

@@ -29 +29 @@
 #include "md5.h"
 #include "soap.h"
-#include "invitation.h"
 
 static gboolean msn_sb_callback(gpointer data, gint source, b_input_condition cond);
@@ -182 +181 @@
                 } else if (strcmp(text, SB_KEEPALIVE_MESSAGE) == 0) {
                         buf = g_strdup(MSN_SB_KEEPALIVE_HEADERS);
-                        i = strlen(buf);
-                } else if (strncmp(text, MSN_INVITE_HEADERS, sizeof(MSN_INVITE_HEADERS) - 1) == 0) {
-                        buf = g_strdup(text);
                         i = strlen(buf);
                 } else {
@@ -664 +660 @@
                         }
                 }
-#if 0
-                // Disable MSN ft support for now.
-                else if (g_strncasecmp(ct, "text/x-msmsgsinvite", 19) == 0) {
-                        char *command = get_rfc822_header(body, "Invitation-Command:", blen);
-                        char *cookie = get_rfc822_header(body, "Invitation-Cookie:", blen);
-                        unsigned int icookie;
-
-                        g_free(ct);
-
-                        /* Every invite should have both a Command and Cookie header */
-                        if (!command || !cookie) {
-                                g_free(command);
-                                g_free(cookie);
-                                imcb_log(ic, "Warning: No command or cookie from %s", sb->who);
-                                return 1;
-                        }
-
-                        icookie = strtoul(cookie, NULL, 10);
-                        g_free(cookie);
-
-                        if (g_strncasecmp(command, "INVITE", 6) == 0) {
-                                msn_invitation_invite(sb, cmd[1], icookie, body, blen);
-                        } else if (g_strncasecmp(command, "ACCEPT", 6) == 0) {
-                                msn_invitation_accept(sb, cmd[1], icookie, body, blen);
-                        } else if (g_strncasecmp(command, "CANCEL", 6) == 0) {
-                                msn_invitation_cancel(sb, cmd[1], icookie, body, blen);
-                        } else {
-                                imcb_log(ic, "Warning: Received invalid invitation with "
-                                         "command %s from %s", command, sb->who);
-                        }
-
-                        g_free(command);
-                }
-#endif
                 else if (g_strncasecmp(ct, "application/x-msnmsgrp2p", 24) == 0) {
                         /* Not currently implemented. Don't warn about it since