Changeset 7125cb3 for protocols/jabber

Timestamp:

2008-08-24T18:01:05Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f3579fd

Parents:

934dddf3

Message:

Added SET_INVALID, which set evaluators should now return instead of NULL
when the given value is not accepted. This to allow certain variables
actually be set to NULL (server, for example). This should fully close
#444.

Location:

protocols/jabber

Files:

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

protocols/jabber/jabber.c

@@ -70 +70 @@
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         
         s = set_add( &acc->set, "ssl", "false", set_eval_bool, acc );

protocols/jabber/jabber_util.c

@@ -37 +37 @@
                 /* Priority is a signed 8-bit integer, according to RFC 3921. */
                 if( i < -128 || i > 127 )
-                        return NULL;
+                        return SET_INVALID;
         }
         else
-                return NULL;
+                return SET_INVALID;
         
         /* Only run this stuff if the account is online ATM,