Changeset 788a1af for protocols/jabber/jabber_util.c

Timestamp:

2006-10-15T20:24:01Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d74c644

Parents:

e617b35

Message:

Proper cleanup of jabber buddy structures when removing a buddy from the
list, proper checking (and handling) of events related to buddies that
aren't "hashed" yet, limit checks on priorityto setting, renamed JEP85
to XEP85, support for more XEP85 states.

File:

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

protocols/jabber/jabber_util.c

@@ -29 +29 @@
 {
         account_t *acc = set->data;
-        char *ret;
-        
-        ret = set_eval_int( set, value );
+        int i;
+        
+        if( sscanf( value, "%d", &i ) == 1 )
+        {
+                /* Priority is a signed 8-bit integer, according to RFC 3921. */
+                if( i < -128 || i > 127 )
+                        return NULL;
+        }
+        else
+                return NULL;
         
         /* Only run this stuff if the account is online ATM,
            and if the setting seems to be acceptable. */
-        if( acc->gc && ret )
+        if( acc->gc )
         {
                 /* Although set_eval functions usually are very nice and
@@ -47 +54 @@
                 
                 g_free( set->value );
-                set->value = g_strdup( ret );
+                set->value = g_strdup( value );
                 
                 /* (Yes, sorry, I prefer the hack. :-P) */
@@ -54 +61 @@
         }
         
-        return ret;
+        return value;
 }
 
@@ -283 +290 @@
 }
 
+/* Finds a buddy from our structures. Can find both full- and bare JIDs. When
+   asked for a bare JID, it uses the "resource_select" setting to see which
+   resource to pick. */
 struct jabber_buddy *jabber_buddy_by_jid( struct gaim_connection *gc, char *jid )
 {
@@ -323 +333 @@
 }
 
+/* Remove one specific full JID from our list. Use this when a buddy goes
+   off-line (because (s)he can still be online from a different location. */
 int jabber_buddy_remove( struct gaim_connection *gc, char *full_jid )
 {
@@ -381 +393 @@
         }
 }
+
+/* Remove a buddy completely; removes all resources that belong to the
+   specified bare JID. Use this when removing someone from the contact
+   list, for example. */
+int jabber_buddy_remove_bare( struct gaim_connection *gc, char *bare_jid )
+{
+        struct jabber_data *jd = gc->proto_data;
+        struct jabber_buddy *bud, *next;
+        
+        if( strchr( bare_jid, '/' ) )
+                return 0;
+        
+        if( ( bud = g_hash_table_lookup( jd->buddies, bare_jid ) ) )
+        {
+                /* Most important: Remove the hash reference. We don't know
+                   this buddy anymore. */
+                g_hash_table_remove( jd->buddies, bud->handle );
+                
+                /* Deallocate the linked list of resources. */
+                while( bud )
+                {
+                        next = bud->next;
+                        g_free( bud->full_jid );
+                        g_free( bud->away_message );
+                        g_free( bud );
+                        bud = next;
+                }
+                
+                return 1;
+        }
+        else
+        {
+                return 0;
+        }
+}