Changeset 0adce21

Timestamp:

2008-01-20T00:01:31Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

31e5846

Parents:

003553b

Message:

GET_BUDDY_FIRST wasn't actually implemented, even though it was in use
already. I don't want to know how long it took me to find out...

File:

• protocols/jabber/jabber_util.c (modified) (3 diffs)

protocols/jabber/jabber_util.c

@@ -392 +392 @@
                 if( ( bud = g_hash_table_lookup( jd->buddies, jid ) ) )
                 {
+                        /* Just return the first one for this bare JID. */
+                        if( flags & GET_BUDDY_FIRST )
+                        {
+                                *s = '/';
+                                g_free( jid );
+                                return bud;
+                        }
+                        
                         /* Is this one of those no-resource buddies? */
                         if( bud->resource == NULL )
                         {
+                                *s = '/';
                                 g_free( jid );
                                 return NULL;
                         }
-                        else
-                        {
-                                /* See if there's an exact match. */
-                                for( ; bud; bud = bud->next )
-                                        if( g_strcasecmp( bud->resource, s + 1 ) == 0 )
-                                                break;
-                        }
+                        
+                        /* See if there's an exact match. */
+                        for( ; bud; bud = bud->next )
+                                if( g_strcasecmp( bud->resource, s + 1 ) == 0 )
+                                        break;
                 }
                 else
@@ -413 +420 @@
                            is done to handle conferences properly. */
                         none_found = 1;
+                        /* TODO(wilmer): Find out what I was thinking when I
+                           wrote this??? And then fix it. This makes me sad... */
                 }
                 
@@ -442 +451 @@
                 else if( ( bud->resource == NULL || bud->next == NULL ) )
                         /* No need for selection if there's only one option. */
+                        return bud;
+                else if( flags & GET_BUDDY_FIRST )
+                        /* Looks like the caller doesn't care about details. */
                         return bud;