Changeset 1f92a58 for root_commands.c

Timestamp:

2010-04-10T02:27:50Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

17a6ee9

Parents:

57c96f7

Message:

Restore the storage module.

File:

• root_commands.c (modified) (10 diffs)

root_commands.c

@@ -136 +136 @@
 }
 
-#if 0
 static void cmd_account( irc_t *irc, char **cmd );
 
@@ -162 +161 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
-                if( set_getbool( &irc->set, "auto_connect" ) )
+                if( set_getbool( &irc->b->set, "auto_connect" ) )
                         cmd_account( irc, account_on );
                 break;
@@ -202 +201 @@
         storage_status_t status;
         
-        status = storage_remove (irc->nick, cmd[1]);
+        status = storage_remove (irc->user->nick, cmd[1]);
         switch (status) {
         case STORAGE_NO_SUCH_USER:
@@ -214 +213 @@
                 irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
-                irc_usermsg( irc, "Account `%s' removed", irc->nick );
+                irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
                 break;
         default:
@@ -221 +220 @@
         }
 }
-#endif
+
+static void cmd_save( irc_t *irc, char **cmd )
+{
+        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
+                irc_usermsg( irc, "Please create an account first" );
+        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
+                irc_usermsg( irc, "Configuration saved" );
+        else
+                irc_usermsg( irc, "Configuration could not be saved!" );
+}
 
 struct cmd_account_del_data
@@ -909 +917 @@
 }
 
-static void cmd_save( irc_t *irc, char **cmd )
-{
-        if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_usermsg( irc, "Please create an account first" );
-        else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
-                irc_usermsg( irc, "Configuration saved" );
-        else
-                irc_usermsg( irc, "Configuration could not be saved!" );
-}
-
 static void cmd_blist( irc_t *irc, char **cmd )
 {
@@ -984 +982 @@
 }
 
-static void cmd_nick( irc_t *irc, char **cmd ) 
-{
-        account_t *a;
-
-        if( !cmd[1] || !( a = account_get( irc, cmd[1] ) ) )
-        {
-                irc_usermsg( irc, "Invalid account");
-        }
-        else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
-        {
-                irc_usermsg( irc, "That account is not on-line" );
-        }
-        else if ( !cmd[2] ) 
-        {
-                irc_usermsg( irc, "Your name is `%s'" , a->ic->displayname ? a->ic->displayname : "NULL" );
-        }
-        else if ( !a->prpl->set_my_name ) 
-        {
-                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
-        }
-        else
-        {
-                irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
-                
-                a->prpl->set_my_name( a->ic, cmd[2] );
-        }
-}
-
 static void cmd_qlist( irc_t *irc, char **cmd )
 {
@@ -1030 +1000 @@
                 else
                         irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
-}
-
-static void cmd_join_chat( irc_t *irc, char **cmd )
-{
-        irc_usermsg( irc, "This command is now obsolete. "
-                          "Please try the `chat' command instead." );
 }
 
@@ -1216 +1180 @@
         { "help",           0, cmd_help,           0 }, 
         { "account",        1, cmd_account,        0 },
-#if 0
         { "identify",       1, cmd_identify,       0 },
         { "register",       1, cmd_register,       0 },
         { "drop",           1, cmd_drop,           0 },
+        { "save",           0, cmd_save,           0 },
+#if 0
         { "add",            2, cmd_add,            0 },
         { "info",           1, cmd_info,           0 },
@@ -1228 +1193 @@
         { "block",          1, cmd_block,          0 },
         { "allow",          1, cmd_allow,          0 },
-        { "save",           0, cmd_save,           0 },
         { "set",            0, cmd_set,            0 },
         { "yes",            0, cmd_yesno,          0 },