Changeset 9cb9868

Timestamp:

2005-11-15T14:47:17Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

5c09a59, c998255

Parents:

9a103a2

Message:

Remove handle_cmp() replacing it by a protocol-specific function.

Files:

• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (2 diffs)
• protocols/oscar/oscar_util.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (1 diff)
• user.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -2441 +2441 @@
         ret->alias_buddy = jabber_roster_update;
         ret->group_buddy = jabber_group_change;
+        ret->cmp_buddynames = g_strcasecmp;
 
         my_protocol = ret;

protocols/msn/msn.c

@@ -398 +398 @@
         ret->rem_deny = msn_rem_deny;
         ret->send_typing = msn_send_typing;
+        ret->cmp_buddynames = g_strcasecmp;
 
         my_protocol = ret;

protocols/nogaim.c

@@ -162 +162 @@
         return( NULL );
 }
-
-/* Compare two handles for a specific protocol. For most protocols,
-   g_strcasecmp is okay, but for AIM, for example, it's not. This really
-   should be a compare function inside the PRPL module, but I do it this
-   way for now because I don't want to touch the Gaim code too much since
-   it's not going to be here for too long anymore. */
-int handle_cmp( char *a, char *b, int protocol )
-{
-        if( protocol == PROTO_TOC || protocol == PROTO_ICQ )
-        {
-                /* AIM, being teh evil, thinks it's cool that users can put
-                   random spaces in screennames. But "A B" and "AB" are
-                   equal. Hrmm, okay. */
-                while( 1 )
-                {
-                        while( *a == ' ' ) a ++;
-                        while( *b == ' ' ) b ++;
-                        
-                        if( *a && *b )
-                        {
-                                if( tolower( *a ) != tolower( *b ) )
-                                        return( 1 );
-                        }
-                        else if( *a || *b )
-                                return( 1 );
-                        else
-                                return( 0 );
-                        
-                        a ++;
-                        b ++;
-                }
-        }
-        else
-        {
-                return( g_strcasecmp( a, b ) );
-        }
-}
-
 
 /* multi.c */
@@ -836 +798 @@
         
         /* It might be yourself! */
-        if( handle_cmp ( handle, b->gc->user->username, b->gc->protocol ) == 0 )
+        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );

protocols/nogaim.h

@@ -220 +220 @@
 
         char *(* get_status_string) (struct gaim_connection *gc, int stat);
+
+        int (* cmp_buddynames) (const char *who1, const char *who2);
 };
 
@@ -259 +261 @@
 int proto_away( struct gaim_connection *gc, char *away );
 char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
-int handle_cmp( char *a, char *b, int protocol );
 
 gboolean auto_reconnect( gpointer data );

protocols/oscar/oscar.c

@@ -1210 +1210 @@
         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;
@@ -2486 +2482 @@
         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;
 

protocols/oscar/oscar_util.c

@@ -1 @@
-/*
- *
- *
- *
- */
-
 #include <aim.h>
 #include <ctype.h>

protocols/yahoo/yahoo.c

@@ -417 +417 @@
         ret->chat_leave = byahoo_chat_leave;
         ret->chat_open = byahoo_chat_open;
+        ret->cmp_buddynames = g_strcasecmp;
         
         my_protocol = ret;

user.c

@@ -146 +146 @@
         while( u )
         {
-                if( u->gc == gc && u->handle && handle_cmp( u->handle, handle, gc->protocol ) == 0 )
+                if( u->gc == gc && u->handle && gc->prpl->cmp_buddynames ( u->handle, handle ) == 0 )
                         break;
                 u = u->next;