Changeset 172a73f1 for protocols/jabber/jabber_util.c

Timestamp:

2006-09-24T10:25:41Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

42127dc

Parents:

5e202b0

Message:

Updated <presence> stuff to handle changing the priority setting.

File:

• protocols/jabber/jabber_util.c (modified) (1 diff)

protocols/jabber/jabber_util.c

@@ -29 +29 @@
 {
         account_t *acc = set->data;
+        char *ret;
         
-        /* Only run this stuff if the account is online ATM. */
-        if( acc->gc )
+        if( strcmp( set->key, "priority" ) == 0 )
+                ret = set_eval_int( set, value );
+        else
+                ret = value;
+        
+        /* Only run this stuff if the account is online ATM,
+           and if the setting seems to be acceptable. */
+        if( acc->gc && ret )
         {
-                /* ... */
+                if( strcmp( set->key, "priority" ) == 0 )
+                {
+                        /* Although set_eval functions usually are very nice
+                           and convenient, they have one disadvantage: If I
+                           would just call p_s_u() now to send the new prio
+                           setting, it would send the old setting because the
+                           set->value gets changed when the eval returns a
+                           non-NULL value.
+                           
+                           So now I can choose between implementing post-set
+                           functions next to evals, or just do this little
+                           hack: */
+                        g_free( set->value );
+                        set->value = g_strdup( ret );
+                        
+                        /* (Yes, sorry, I prefer the hack. :-P) */
+                        
+                        presence_send_update( acc->gc );
+                }
+                else
+                {
+                }
         }
         
-        if( g_strcasecmp( set->key, "priority" ) == 0 )
-                return set_eval_int( set, value );
-        else
-                return value;
+        return ret;
 }