Changeset 7125cb3 for protocols/nogaim.c

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.

File:

• protocols/nogaim.c (modified) (2 diffs)

protocols/nogaim.c

@@ -928 +928 @@
         int st;
         
-        if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) )
-                st = 1;
-        else if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) )
-                st = 0;
-        else if( sscanf( value, "%d", &st ) != 1 )
-                return( NULL );
-        
-        st = st != 0;
+        if( !is_bool( value ) )
+                return SET_INVALID;
+        
+        st = bool2int( value );
         
         /* Horror.... */
@@ -979 +975 @@
         }
         
-        return( set_eval_bool( set, value ) );
+        return value;
 }