Changes in / [256899f:ef5c185]

Files:

• doc/user-guide/commands.xml (modified) (3 diffs)
• root_commands.c (modified) (6 diffs)
• set.c (modified) (1 diff)
• set.h (modified) (1 diff)

doc/user-guide/commands.xml

@@ -134 +134 @@
                         <syntax>account set &lt;account id&gt;/&lt;setting&gt;</syntax>
                         <syntax>account set &lt;account id&gt;/&lt;setting&gt; &lt;value&gt;</syntax>
-                        <syntax>account set -del &lt;account id&gt;/&lt;setting&gt;</syntax>
 
                         <description>
@@ -142 +141 @@
                                 
                                 <para>
-                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>. For details about the syntax of this command, see <emphasis>help set</emphasis>.
+                                        For more infomation about a setting, see <emphasis>help set &lt;setting&gt;</emphasis>.
                                 </para>
                                 
@@ -247 +246 @@
         <bitlbee-command name="set">
                 <short-description>Miscellaneous settings</short-description>
-                <syntax>set</syntax>
-                <syntax>set &lt;variable&gt;</syntax>
-                <syntax>set &lt;variable&gt; &lt;value&gt;</syntax>
-                <syntax>set -del &lt;variable&gt;</syntax>
-
-                <description>
-
-                        <para>
-                                Without any arguments, this command lists all the set variables. You can also specify a single argument, a variable name, to get that variable's value. To change this value, specify the new value as the second argument. With <emphasis>-del</emphasis> you can reset a setting to its default value.
+                <syntax>set [&lt;variable&gt; [&lt;value&gt;]]</syntax>
+
+                <description>
+
+                        <para>
+                                Without any arguments, this command lists all the set variables. You can also specify a single argument, a variable name, to get that variable's value. To change this value, specify the new value as the second argument.
                         </para>
 

root_commands.c

@@ -368 +368 @@
                 }
                 
-                if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                        acc_handle = g_strdup( cmd[3] );
-                else
-                        acc_handle = g_strdup( cmd[2] );
-                
+                acc_handle = g_strdup( cmd[2] );
                 if( ( tmp = strchr( acc_handle, '/' ) ) )
                 {
@@ -378 +374 @@
                         set_name = tmp + 1;
                 }
-                
-                if( ( a = account_get( irc, acc_handle ) ) == NULL )
+                a = account_get( irc, acc_handle );
+                
+                if( a == NULL )
                 {
                         g_free( acc_handle );
@@ -403 +400 @@
                         }
                         
+                        set_setstr( &a->set, set_name, cmd[3] );
+                        
                         if( ( strcmp( cmd[3], "=" ) ) == 0 && cmd[4] )
                                 irc_usermsg( irc, "Warning: Correct syntax: \002account set <variable> <value>\002 (without =)" );
-                        else if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                                set_reset( &a->set, set_name );
-                        else
-                                set_setstr( &a->set, set_name, cmd[3] );
                 }
                 if( set_name ) /* else 'forgotten' on purpose.. Must show new value after changing */
@@ -424 +419 @@
                         {
                                 if( s->value || s->def )
-                                        irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
+                                        irc_usermsg( irc, "%s = `%s'", s->key, s->value?s->value:s->def );
                                 else
                                         irc_usermsg( irc, "%s is empty", s->key );
@@ -745 +740 @@
 static void cmd_set( irc_t *irc, char **cmd )
 {
-        char *set_name;
-        
         if( cmd[1] && cmd[2] )
         {
+                set_setstr( &irc->set, cmd[1], cmd[2] );
+                
                 if( ( strcmp( cmd[2], "=" ) ) == 0 && cmd[3] )
-                {
                         irc_usermsg( irc, "Warning: Correct syntax: \002set <variable> <value>\002 (without =)" );
-                        return;
-                }
-                else if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
-                {
-                        set_reset( &irc->set, cmd[2] );
-                        set_name = cmd[2];
-                }
+        }
+        if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */
+        {
+                char *s = set_getstr( &irc->set, cmd[1] );
+                if( s )
+                        irc_usermsg( irc, "%s = `%s'", cmd[1], s );
                 else
-                {
-                        set_setstr( &irc->set, cmd[1], cmd[2] );
-                        set_name = cmd[1];
-                }
-        }
-        if( cmd[1] ) /* else 'forgotten' on purpose.. Must show new value after changing */
-        {
-                char *s = set_getstr( &irc->set, set_name );
-                if( s )
-                        irc_usermsg( irc, "%s = `%s'", set_name, s );
-                else
-                        irc_usermsg( irc, "%s is empty", set_name );
+                        irc_usermsg( irc, "%s is empty", cmd[1] );
         }
         else
@@ -779 +761 @@
                 {
                         if( s->value || s->def )
-                                irc_usermsg( irc, "%s = `%s'", s->key, s->value ? s->value : s->def );
+                                irc_usermsg( irc, "%s = `%s'", s->key, s->value?s->value:s->def );
                         else
                                 irc_usermsg( irc, "%s is empty", s->key );

set.c

@@ -168 +168 @@
 }
 
-void set_reset( set_t **head, char *key )
-{
-        set_t *s;
-        
-        s = set_find( head, key );
-        if( s )
-                set_setstr( head, key, s->def );
-}
-
 char *set_eval_int( set_t *set, char *value )
 {

set.h

@@ -88 +88 @@
 int set_setint( set_t **head, char *key, int value );
 void set_del( set_t **head, char *key );
-void set_reset( set_t **head, char *key );
 
 /* Two very useful generic evaluators. */