Changeset ebe7b36

Timestamp:

2006-09-25T10:10:14Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

281859e

Parents:

eab2ac4

Message:

Changing the resource string while online probably doesn't work.

Location:

protocols/jabber

Files:

• jabber.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)
• jabber_util.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -40 +40 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
-        s = set_add( &acc->set, "priority", "0", set_eval_resprio, acc );
-        
-        s = set_add( &acc->set, "resource", "BitlBee", set_eval_resprio, acc );
+        s = set_add( &acc->set, "priority", "0", set_eval_priority, acc );
+        
+        s = set_add( &acc->set, "resource", "BitlBee", NULL, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY;
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
@@ -234 +235 @@
 }
 
+/* XMPP doesn't have both a block- and and allow-list, so these two functions
+   will be no-ops: */
 static void jabber_add_deny( struct gaim_connection *gc, char *who )
 {

protocols/jabber/jabber.h

@@ -85 +85 @@
 
 /* jabber_util.c */
-char *set_eval_resprio( set_t *set, char *value );
+char *set_eval_priority( set_t *set, char *value );
 char *set_eval_tls( set_t *set, char *value );
 struct xt_node *jabber_make_packet( char *name, char *type, char *to, struct xt_node *children );

protocols/jabber/jabber_util.c

@@ -26 +26 @@
 static int next_id = 1;
 
-char *set_eval_resprio( set_t *set, char *value )
+char *set_eval_priority( set_t *set, char *value )
 {
         account_t *acc = set->data;
         char *ret;
         
-        if( strcmp( set->key, "priority" ) == 0 )
-                ret = set_eval_int( set, value );
-        else
-                ret = value;
+        ret = set_eval_int( set, value );
         
         /* Only run this stuff if the account is online ATM,
@@ -40 +37 @@
         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
-                {
-                }
+                /* 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 );
         }