Changes in root_commands.c [8358691:674a01d]

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -55 +55 @@
         
         len = strlen( cmd[0] );
-        for( i = 0; root_commands[i].command; i++ )
-                if( g_strncasecmp( root_commands[i].command, cmd[0], len ) == 0 )
-                {
-                        if( root_commands[i+1].command &&
-                            g_strncasecmp( root_commands[i+1].command, cmd[0], len ) == 0 )
+        for( i = 0; commands[i].command; i++ )
+                if( g_strncasecmp( commands[i].command, cmd[0], len ) == 0 )
+                {
+                        if( commands[i+1].command &&
+                            g_strncasecmp( commands[i+1].command, cmd[0], len ) == 0 )
                                 /* Only match on the first letters if the match is unique. */
                                 break;
                         
-                        MIN_ARGS( root_commands[i].required_parameters );
+                        MIN_ARGS( commands[i].required_parameters );
                         
-                        root_commands[i].execute( irc, cmd );
+                        commands[i].execute( irc, cmd );
                         return;
                 }
@@ -1284 +1284 @@
 }
 
+static void cmd_nick( irc_t *irc, char **cmd )
+{
+        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
+}
+
 /* Maybe this should be a stand-alone command as well? */
 static void bitlbee_whatsnew( irc_t *irc )
 {
         int last = set_getint( &irc->b->set, "last_version" );
-        GString *msg = g_string_new( "" );
-        char s[16];
+        char s[16], *msg;
         
         if( last >= BITLBEE_VERSION_CODE )
                 return;
         
-        if( last < 0x010206 ) /* 1.2.6 */
-        {
-                g_string_append( msg,
-                        "Twitter support. See \x02help account add twitter\x02.\n" );
-        }
-        if( last < 0x010300 ) /* 1.3dev */
-        {
-                g_string_append( msg,
-                        "Support for multiple configurable control channels, "
-                        "each with a subset of your contact list. See "
-                        "\x02help channels\x02 for more information.\n"
-                        "File transfer support for some protocols (more if "
-                        "you use libpurple). Just /DCC SEND stuff. Incoming "
-                        "files also become DCC transfers.\n"
-                        "Many more things, briefly described in "
-                        "\x02help news1.3\x02.\n" );
-        }
-        
-        if( msg->len > 0 )
+        msg = help_get_whatsnew( &(global.help), last );
+        
+        if( msg )
                 irc_usermsg( irc, "%s: This seems to be your first time using this "
                                   "this version of BitlBee. Here's a list of new "
                                   "features you may like to know about:\n\n%s\n",
-                                  irc->user->nick, msg->str );
-        
-        g_string_free( msg, TRUE );
+                                  irc->user->nick, msg );
+        
+        g_free( msg );
+        
         g_snprintf( s, sizeof( s ), "%d", BITLBEE_VERSION_CODE );
         set_setstr( &irc->b->set, "last_version", s );
@@ -1324 +1313 @@
 
 /* IMPORTANT: Keep this list sorted! The short command logic needs that. */
-command_t root_commands[] = {
+const command_t commands[] = {
         { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
@@ -1338 +1327 @@
         { "identify",       1, cmd_identify,       0 },
         { "info",           1, cmd_info,           0 },
+        { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
         { "qlist",          0, cmd_qlist,          0 },
@@ -1347 +1337 @@
         { "transfer",       0, cmd_transfer,       0 },
         { "yes",            0, cmd_yesno,          0 },
-        /* Not expecting too many plugins adding root commands so just make a
-           dumb array with some empty entried at the end. */
-        { NULL },
-        { NULL },
-        { NULL },
-        { NULL },
-        { NULL },
-        { NULL },
-        { NULL },
-        { NULL },
-        { NULL },
+        { NULL }
 };
-static const int num_root_commands = sizeof( root_commands ) / sizeof( command_t );
-
-gboolean root_command_add( const char *command, int params, void (*func)(irc_t *, char **args), int flags )
-{
-        int i;
-        
-        if( root_commands[num_root_commands-2].command )
-                /* Planning fail! List is full. */
-                return FALSE;
-        
-        for( i = 0; root_commands[i].command; i++ )
-        {
-                if( g_strcasecmp( root_commands[i].command, command ) == 0 )
-                        return FALSE;
-                else if( g_strcasecmp( root_commands[i].command, command ) > 0 )
-                        break;
-        }
-        memmove( root_commands + i + 1, root_commands + i,
-                 sizeof( command_t ) * ( num_root_commands - i - 1 ) );
-        
-        root_commands[i].command = g_strdup( command );
-        root_commands[i].required_parameters = params;
-        root_commands[i].execute = func;
-        root_commands[i].flags = flags;
-        
-        return TRUE;
-}