Changeset cc9079e for protocols/oscar/oscar.c

Timestamp:

2005-11-15T15:16:53Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

9c8ae50

Parents:

f56c491 (diff), c998255 (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 other branch.

File:

• protocols/oscar/oscar.c (modified) (2 diffs)

protocols/oscar/oscar.c

@@ -1208 +1208 @@
         return 1;
 }
-/*
-int handle_cmp_aim(const char * a, const char * b) {
-        return handle_cmp(a, b, PROTO_TOC);
-}
-*/
+
 static int gaim_parse_incoming_im(aim_session_t *sess, aim_frame_t *fr, ...) {
         int channel, ret = 0;
@@ -2484 +2480 @@
         ret->set_permit_deny = oscar_set_permit_deny;
         ret->keepalive = oscar_keepalive;
+        ret->cmp_buddynames = aim_sncmp;
         ret->get_status_string = oscar_get_status_string;