Ignore:
Timestamp:
2010-06-05T23:26:07Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4aa0f6b, bc49ec2
Parents:
b308cf9 (diff), 3dc6d86 (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:

Merging mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    rb308cf9 r1fdb0a4  
    374374        if (isdigit(acc->user[0])) {
    375375                set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
     376                set_add(&acc->set, "old_icq_auth", "false", set_eval_bool, acc);
    376377        }
    377378       
     
    10301031                m = g_list_append(m, exch);
    10311032
    1032                 g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg );
     1033                g_snprintf(txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg);
    10331034
    10341035                inv->ic = ic;
     
    10361037                inv->name = g_strdup(name);
    10371038               
    1038                 imcb_ask( ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
     1039                imcb_ask(ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
    10391040       
    10401041                if (name)
    10411042                        g_free(name);
     1043        } else if (args->reqclass & AIM_CAPS_ICQRTF) {
     1044                // TODO: constify
     1045                char text[strlen(args->info.rtfmsg.rtfmsg)+1];
     1046                strncpy(text, args->info.rtfmsg.rtfmsg, sizeof(text));
     1047                imcb_buddy_msg(ic, normalize(userinfo->sn), text, 0, 0);
    10421048        }
    10431049
Note: See TracChangeset for help on using the changeset viewer.