Ignore:
Timestamp:
2005-11-15T14:57:38Z (15 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
2cdd8ce, cc9079e
Parents:
b135438 (diff), 9cb9868 (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 from Jelmer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    rb135438 rc998255  
    12081208        return 1;
    12091209}
    1210 /*
    1211 int handle_cmp_aim(const char * a, const char * b) {
    1212         return handle_cmp(a, b, PROTO_TOC);
    1213 }
    1214 */
     1210
    12151211static int gaim_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...) {
    12161212        int channel, ret = 0;
     
    24842480        ret->set_permit_deny = oscar_set_permit_deny;
    24852481        ret->keepalive = oscar_keepalive;
     2482        ret->cmp_buddynames = aim_sncmp;
    24862483        ret->get_status_string = oscar_get_status_string;
    24872484
Note: See TracChangeset for help on using the changeset viewer.