Changeset c05eb5b

Timestamp:

2008-09-29T21:53:05Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

de49316

Parents:

fb98634

Message:

Checking account setting's flags again before changing them.

File:

• root_commands.c (modified) (6 diffs)

root_commands.c

@@ -260 +260 @@
 
 typedef set_t** (*cmd_set_findhead)( irc_t*, char* );
-
-static int cmd_set_real( irc_t *irc, char **cmd, cmd_set_findhead findhead )
+typedef int (*cmd_set_checkflags)( irc_t*, set_t *set );
+
+static int cmd_set_real( irc_t *irc, char **cmd, cmd_set_findhead findhead, cmd_set_checkflags checkflags )
 {
         char *set_full = NULL, *set_name = NULL, *tmp;
@@ -308 +309 @@
                 int st;
                 
-                /*
-                FIXME: Make these work again. Probably a gross hack.
-                
-                if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
-                {
-                        irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+                if( checkflags && checkflags( irc, s ) == 0 )
                         return 0;
-                }
-                else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
-                {
-                        irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
-                        return 0;
-                }
-                */
                 
                 if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
@@ -365 +354 @@
         else
                 return NULL;
+}
+
+static int cmd_account_set_checkflags( irc_t *irc, set_t *s )
+{
+        account_t *a = s->data;
+        
+        if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
+        {
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+                return 0;
+        }
+        else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
+        {
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
+                return 0;
+        }
+        
+        return 1;
 }
 
@@ -535 +542 @@
                 MIN_ARGS( 2 );
                 
-                cmd_set_real( irc, cmd + 1, cmd_account_set_findhead );
+                cmd_set_real( irc, cmd + 1, cmd_account_set_findhead, cmd_account_set_checkflags );
         }
         else
@@ -869 +876 @@
 static void cmd_set( irc_t *irc, char **cmd )
 {
-        cmd_set_real( irc, cmd, NULL );
+        cmd_set_real( irc, cmd, NULL, NULL );
 }
 
@@ -1066 +1073 @@
         else if( g_strcasecmp( cmd[1], "set" ) == 0 )
         {
-                cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead );
+                cmd_set_real( irc, cmd + 1, cmd_chat_set_findhead, NULL );
         }
         else if( g_strcasecmp( cmd[1], "del" ) == 0 )