Changes in user.c [5b52a48:38cc9d4]

File:

• user.c (modified) (2 diffs)

user.c

@@ -67 +67 @@
         
         u->user = u->realname = u->host = u->nick = g_strdup( nick );
-        u->is_private = set_getint( &irc->set, "private" );
+        u->is_private = set_getint( irc, "private" );
         
         key = g_strdup( nick );
@@ -143 +143 @@
 user_t *user_findhandle( struct gaim_connection *gc, char *handle )
 {
-        user_t *u;
-        char *nick;
-        
-        /* First, let's try a hash lookup. If it works, it's probably faster. */
-        if( ( nick = g_hash_table_lookup( gc->acc->nicks, handle ) ) &&
-            ( u = user_find( gc->irc, nick ) ) &&
-            ( gc->acc->prpl->handle_cmp( handle, u->handle ) == 0 ) )
-                return u;
-        
-        /* However, it doesn't always work, so in that case we'll have to dig
-           through the whole userlist. :-( */
-        for( u = gc->irc->users; u; u = u->next )
-                if( u->gc == gc && u->handle && gc->acc->prpl->handle_cmp( u->handle, handle ) == 0 )
-                        return u;
-        
-        return NULL;
+        user_t *u = gc->irc->users;
+        
+        while( u )
+        {
+                if( u->gc == gc && u->handle && gc->prpl->cmp_buddynames ( u->handle, handle ) == 0 )
+                        break;
+                u = u->next;
+        }
+        
+        return( u );
 }