Changeset f3579fd

Timestamp:

2008-08-24T20:52:31Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f536a99

Parents:

7125cb3

Message:

Clearer feedback after set/account set commands.

Files:

• account.c (modified) (1 diff)
• irc.c (modified) (2 diffs)
• root_commands.c (modified) (6 diffs)
• set.c (modified) (2 diffs)
• set.h (modified) (1 diff)

account.c

@@ -55 +55 @@
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );

irc.c

@@ -34 +34 @@
 GSList *irc_connection_list = NULL;
 
-static char *passchange( set_t *set, char *value )
+static char *set_eval_password( set_t *set, char *value )
 {
         irc_t *irc = set->data;
         
-        irc_setpass( irc, value );
-        irc_usermsg( irc, "Password successfully changed" );
-        return NULL;
+        if( irc->status & USTATUS_IDENTIFIED )
+        {
+                irc_setpass( irc, value );
+                return NULL;
+        }
+        else
+        {
+                return SET_INVALID;
+        }
 }
 
@@ -150 +156 @@
         s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "ops", "both", set_eval_ops, irc );
-        s = set_add( &irc->set, "password", NULL, passchange, irc );
+        s = set_add( &irc->set, "password", NULL, set_eval_password, irc );
         s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "private", "true", set_eval_bool, irc );

root_commands.c

@@ -238 +238 @@
 }
 
+static void cmd_showset( irc_t *irc, set_t *set )
+{
+        char *s;
+        
+        if( set && ( s = set_getstr( &set, set->key ) ) ) /* HACK! */
+                irc_usermsg( irc, "%s = `%s'", set->key, s );
+        else
+                irc_usermsg( irc, "%s is empty", set->key );
+}
+
 static void cmd_account( irc_t *irc, char **cmd )
 {
@@ -445 +455 @@
                 {
                         set_t *s = set_find( &a->set, set_name );
+                        int st;
                         
                         if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
@@ -460 +471 @@
                         
                         if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
-                                set_reset( &a->set, set_name );
+                                st = 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 */
-                {
-                        char *s = set_getstr( &a->set, set_name );
-                        if( s )
-                                irc_usermsg( irc, "%s = `%s'", set_name, s );
+                                st = set_setstr( &a->set, set_name, cmd[3] );
+                        
+                        if( set_getstr( &a->set, set_name ) == NULL )
+                        {
+                                if( st )
+                                        irc_usermsg( irc, "Setting changed successfully" );
+                                else
+                                        irc_usermsg( irc, "Failed to change setting" );
+                        }
                         else
-                                irc_usermsg( irc, "%s is empty", set_name );
+                        {
+                                cmd_showset( irc, set_find( &a->set, set_name ) );
+                        }
+                }
+                else if( set_name )
+                {
+                        cmd_showset( irc, set_find( &a->set, set_name ) );
                 }
                 else
@@ -477 +496 @@
                         while( s )
                         {
-                                if( 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 );
+                                cmd_showset( irc, s );
                                 s = s->next;
                         }
@@ -823 +839 @@
         if( cmd[1] && cmd[2] )
         {
+                int st;
+                
                 if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
                 {
-                        set_reset( &irc->set, cmd[2] );
+                        st = set_reset( &irc->set, cmd[2] );
                         set_name = cmd[2];
                 }
                 else
                 {
-                        set_setstr( &irc->set, cmd[1], cmd[2] );
-                }
-        }
-        if( set_name ) /* 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 );
+                        st = set_setstr( &irc->set, cmd[1], cmd[2] );
+                }
+                
+                /* Normally we just show the variable's new/unchanged
+                   value as feedback to the user, but this has always
+                   caused confusion when changing the password. Give
+                   other feedback instead: */
+                if( set_getstr( &irc->set, set_name ) == NULL )
+                {
+                        if( st )
+                                irc_usermsg( irc, "Setting changed successfully" );
+                        else
+                                irc_usermsg( irc, "Failed to change setting" );
+                }
+                else
+                {
+                        cmd_showset( irc, set_find( &irc->set, set_name ) );
+                }
+        }
+        else if( set_name )
+        {
+                cmd_showset( irc, set_find( &irc->set, set_name ) );
 
                 if( strchr( set_name, '/' ) )
@@ -849 +879 @@
                 while( s )
                 {
-                        if( 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 );
+                        cmd_showset( irc, s );
                         s = s->next;
                 }

set.c

@@ -182 +182 @@
 }
 
-void set_reset( set_t **head, char *key )
+int set_reset( set_t **head, char *key )
 {
         set_t *s;
@@ -188 +188 @@
         s = set_find( head, key );
         if( s )
-                set_setstr( head, key, s->def );
+                return set_setstr( head, key, s->def );
+        
+        return 0;
 }
 

set.h

@@ -92 +92 @@
 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 );
+int set_reset( set_t **head, char *key );
 
 /* Two very useful generic evaluators. */