Changeset 0fb32dd

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

Files:

• irc.h (modified) (1 diff)
• irc_channel.c (modified) (5 diffs)
• protocols/msn/invitation.c (deleted)
• protocols/msn/invitation.h (deleted)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/sb.c (modified) (3 diffs)

irc.h

@@ -302 +302 @@
 void irc_channel_name_strip(char *name);
 int irc_channel_name_cmp(const char *a_, const char *b_);
-char *irc_channel_name_gen(bee_t *bee, const char *name);
+char *irc_channel_name_gen(irc_t *irc, const char *name);
 gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name);
 void irc_channel_update_ops(irc_channel_t *ic, char *value);

irc_channel.c

@@ -556 +556 @@
 }
 
-gboolean irc_channel_is_unused(bee_t *bee, char *name)
+gboolean irc_channel_is_unused(irc_t *irc, char *name)
 {
         char *type, *chat_type;
@@ -565 +565 @@
         }
 
-        if (!(oic = irc_channel_by_name(bee->ui_data, name))) {
+        if (!(oic = irc_channel_by_name(irc, name))) {
                 return TRUE;
         }
@@ -586 +586 @@
 }
 
-char *irc_channel_name_gen(bee_t *bee, const char *hint)
+char *irc_channel_name_gen(irc_t *irc, const char *hint)
 {
         char name[MAX_NICK_LENGTH + 1] = { 0 };
@@ -605 +605 @@
         irc_channel_name_strip(name);
 
-        if (set_getbool(&bee->set, "lcnicks")) {
-                nick_lc(bee->ui_data, name + 1);
-        }
-
-        while (!irc_channel_is_unused(bee, name)) {
+        if (set_getbool(&irc->b->set, "lcnicks")) {
+                nick_lc(irc, name + 1);
+        }
+
+        while (!irc_channel_is_unused(irc, name)) {
                 underscore_dedupe(name);
         }
@@ -626 +626 @@
         }
 
-        if (!(full_name = irc_channel_name_gen(irc->b, name))) {
+        if (!(full_name = irc_channel_name_gen(irc, name))) {
                 return FALSE;
         }

protocols/msn/msn.c

@@ -96 +96 @@
 
         if (md) {
-                /** Disabling MSN ft support for now.
-                while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
-                }
-                */
-
                 msn_ns_close(md->ns);
 
@@ -470 +464 @@
         ret->buddy_action = msn_buddy_action;
 
-        //ret->transfer_request = msn_ftp_transfer_request;
-
         register_protocol(ret);
 }

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