Changeset 0fb32dd


Ignore:
Timestamp:
2015-04-06T17:07:03Z (6 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:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • irc.h

    rb3ebb3a r0fb32dd  
    302302void irc_channel_name_strip(char *name);
    303303int irc_channel_name_cmp(const char *a_, const char *b_);
    304 char *irc_channel_name_gen(bee_t *bee, const char *name);
     304char *irc_channel_name_gen(irc_t *irc, const char *name);
    305305gboolean irc_channel_name_hint(irc_channel_t *ic, const char *name);
    306306void irc_channel_update_ops(irc_channel_t *ic, char *value);
  • irc_channel.c

    rb3ebb3a r0fb32dd  
    556556}
    557557
    558 gboolean irc_channel_is_unused(bee_t *bee, char *name)
     558gboolean irc_channel_is_unused(irc_t *irc, char *name)
    559559{
    560560        char *type, *chat_type;
     
    565565        }
    566566
    567         if (!(oic = irc_channel_by_name(bee->ui_data, name))) {
     567        if (!(oic = irc_channel_by_name(irc, name))) {
    568568                return TRUE;
    569569        }
     
    586586}
    587587
    588 char *irc_channel_name_gen(bee_t *bee, const char *hint)
     588char *irc_channel_name_gen(irc_t *irc, const char *hint)
    589589{
    590590        char name[MAX_NICK_LENGTH + 1] = { 0 };
     
    605605        irc_channel_name_strip(name);
    606606
    607         if (set_getbool(&bee->set, "lcnicks")) {
    608                 nick_lc(bee->ui_data, name + 1);
    609         }
    610 
    611         while (!irc_channel_is_unused(bee, name)) {
     607        if (set_getbool(&irc->b->set, "lcnicks")) {
     608                nick_lc(irc, name + 1);
     609        }
     610
     611        while (!irc_channel_is_unused(irc, name)) {
    612612                underscore_dedupe(name);
    613613        }
     
    626626        }
    627627
    628         if (!(full_name = irc_channel_name_gen(irc->b, name))) {
     628        if (!(full_name = irc_channel_name_gen(irc, name))) {
    629629                return FALSE;
    630630        }
  • protocols/msn/msn.c

    rb3ebb3a r0fb32dd  
    9696
    9797        if (md) {
    98                 /** Disabling MSN ft support for now.
    99                 while( md->filetransfers ) {
    100                         imcb_file_canceled( md->filetransfers->data, "Closing connection" );
    101                 }
    102                 */
    103 
    10498                msn_ns_close(md->ns);
    10599
     
    470464        ret->buddy_action = msn_buddy_action;
    471465
    472         //ret->transfer_request = msn_ftp_transfer_request;
    473 
    474466        register_protocol(ret);
    475467}
  • protocols/msn/sb.c

    rb3ebb3a r0fb32dd  
    2929#include "md5.h"
    3030#include "soap.h"
    31 #include "invitation.h"
    3231
    3332static gboolean msn_sb_callback(gpointer data, gint source, b_input_condition cond);
     
    182181                } else if (strcmp(text, SB_KEEPALIVE_MESSAGE) == 0) {
    183182                        buf = g_strdup(MSN_SB_KEEPALIVE_HEADERS);
    184                         i = strlen(buf);
    185                 } else if (strncmp(text, MSN_INVITE_HEADERS, sizeof(MSN_INVITE_HEADERS) - 1) == 0) {
    186                         buf = g_strdup(text);
    187183                        i = strlen(buf);
    188184                } else {
     
    664660                        }
    665661                }
    666 #if 0
    667                 // Disable MSN ft support for now.
    668                 else if (g_strncasecmp(ct, "text/x-msmsgsinvite", 19) == 0) {
    669                         char *command = get_rfc822_header(body, "Invitation-Command:", blen);
    670                         char *cookie = get_rfc822_header(body, "Invitation-Cookie:", blen);
    671                         unsigned int icookie;
    672 
    673                         g_free(ct);
    674 
    675                         /* Every invite should have both a Command and Cookie header */
    676                         if (!command || !cookie) {
    677                                 g_free(command);
    678                                 g_free(cookie);
    679                                 imcb_log(ic, "Warning: No command or cookie from %s", sb->who);
    680                                 return 1;
    681                         }
    682 
    683                         icookie = strtoul(cookie, NULL, 10);
    684                         g_free(cookie);
    685 
    686                         if (g_strncasecmp(command, "INVITE", 6) == 0) {
    687                                 msn_invitation_invite(sb, cmd[1], icookie, body, blen);
    688                         } else if (g_strncasecmp(command, "ACCEPT", 6) == 0) {
    689                                 msn_invitation_accept(sb, cmd[1], icookie, body, blen);
    690                         } else if (g_strncasecmp(command, "CANCEL", 6) == 0) {
    691                                 msn_invitation_cancel(sb, cmd[1], icookie, body, blen);
    692                         } else {
    693                                 imcb_log(ic, "Warning: Received invalid invitation with "
    694                                          "command %s from %s", command, sb->who);
    695                         }
    696 
    697                         g_free(command);
    698                 }
    699 #endif
    700662                else if (g_strncasecmp(ct, "application/x-msnmsgrp2p", 24) == 0) {
    701663                        /* Not currently implemented. Don't warn about it since
Note: See TracChangeset for help on using the changeset viewer.