Changeset 0fbd3a6d for root_commands.c

Timestamp:

2007-12-19T00:24:32Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

1ba7e8f

Parents:

793cc25 (diff), 2379566 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Now with sending via a proxy. The proxy is automatically discovered from your
jabber server.

Also merged in revs 279..288 from upstream (e.g. PING)

File:

• root_commands.c (modified) (6 diffs)

root_commands.c

@@ -199 +199 @@
                 break;
         default:
-                irc_usermsg( irc, "Error: '%d'", status );
+                irc_usermsg( irc, "Error: `%d'", status );
                 break;
         }
@@ -234 +234 @@
                 a = account_add( irc, prpl, cmd[3], cmd[4] );
                 if( cmd[5] )
+                {
+                        irc_usermsg( irc, "Warning: Passing a servername/other flags to `account add' "
+                                          "is now deprecated. Use `account set' instead." );
                         set_setstr( &a->set, "server", cmd[5] );
+                }
                 
                 irc_usermsg( irc, "Account successfully added" );
@@ -317 +321 @@
                         else
                         {
-                                irc_usermsg( irc, "No accounts known. Use 'account add' to add one." );
+                                irc_usermsg( irc, "No accounts known. Use `account add' to add one." );
                         }
                 }
@@ -403 +407 @@
                         }
                         
-                        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 )
+                        if( g_strncasecmp( cmd[2], "-del", 4 ) == 0 )
                                 set_reset( &a->set, set_name );
                         else
@@ -745 +747 @@
 static void cmd_set( irc_t *irc, char **cmd )
 {
-        char *set_name = NULL;
+        char *set_name = cmd[1];
         
         if( 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 )
+                if( g_strncasecmp( cmd[1], "-del", 4 ) == 0 )
                 {
                         set_reset( &irc->set, cmd[2] );
@@ -762 +759 @@
                 {
                         set_setstr( &irc->set, cmd[1], cmd[2] );
-                        set_name = cmd[1];
                 }
         }