Changeset cc9079e for protocols/nogaim.c

Timestamp:

2005-11-15T15:16:53Z (18 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/nogaim.c (modified) (2 diffs)

protocols/nogaim.c

@@ -224 +224 @@
         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, struct prpl *protocol )
-{
-        if( !strcmp(protocol->name, "oscar") )
-        {
-                /* 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 */
@@ -897 +859 @@
         
         /* It might be yourself! */
-        if( handle_cmp ( handle, b->gc->user->username, b->gc->prpl ) == 0 )
+        if( b->gc->prpl->cmp_buddynames( handle, b->gc->user->username ) == 0 )
         {
                 u = user_find( b->gc->irc, b->gc->irc->nick );