Changeset 69cb623 for user.c

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (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:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

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, "private" );
+        u->is_private = set_getbool( &irc->set, "private" );
         
         key = g_strdup( nick );
@@ -143 +143 @@
 user_t *user_findhandle( struct gaim_connection *gc, char *handle )
 {
-        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 );
+        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;
 }