Changeset 16b5f86

Timestamp:

2006-11-13T10:38:23Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9bcbe48

Parents:

0d3f30f

Message:

Added handling of GET_BUDDY_* flags.

File:

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

protocols/jabber/jabber_util.c

@@ -359 +359 @@
                         if( bud->resource == NULL )
                         {
-                                bud = NULL;
+                                g_free( jid );
+                                return NULL;
                         }
                         else
@@ -370 +371 @@
                 }
                 
-                *s = '/';
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) )
+                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && find_buddy( gc, jid ) )
+                {
+                        *s = '/';
                         bud = jabber_buddy_add( gc, jid );
+                }
                 
                 g_free( jid );
@@ -386 +389 @@
                 g_free( jid );
                 
-                /* An exact match, or only one option. */
                 if( bud == NULL )
-                        return ( flags & GET_BUDDY_CREAT ) ? jabber_buddy_add( gc, jid ) : NULL;
+                        /* No match. Create it now? */
+                        return ( ( flags & GET_BUDDY_CREAT ) && find_buddy( gc, jid ) ) ?
+                                   jabber_buddy_add( gc, jid ) : NULL;
+                else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )
+                        /* We want an exact match, so in thise case there shouldn't be a /resource. */
+                        return NULL;
                 else if( ( bud->resource == NULL || bud->next == NULL ) )
+                        /* No need for selection if there's only one option. */
                         return bud;