Changeset d860a8d for root_commands.c

Timestamp:

2010-04-01T03:38:50Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e63507a

Parents:

81e04e1

Message:

Restored "account" root command and restored enough stuff to be able to
send messages. Also started moving stuff out from nogaim.* into bee_* files.

File:

• root_commands.c (modified) (15 diffs)

root_commands.c

@@ -221 +221 @@
         }
 }
+#endif
 
 struct cmd_account_del_data
@@ -233 +234 @@
         account_t *a;
         
-        for( a = cad->irc->accounts; a && a != cad->a; a = a->next );
+        for( a = cad->irc->b->accounts; a && a != cad->a; a = a->next );
         
         if( a == NULL )
@@ -245 +246 @@
         else
         {
-                account_del( cad->irc, a );
+                account_del( cad->irc->b, a );
                 irc_usermsg( cad->irc, "Account deleted" );
         }
@@ -286 +287 @@
                 set_name = set_full;
                 
-                head = &irc->set;
+                head = &irc->b->set;
         }
         else 
@@ -357 +358 @@
         account_t *a;
         
-        if( ( a = account_get( irc, id ) ) )
+        if( ( a = account_get( irc->b, id ) ) )
                 return &a->set;
         else
@@ -405 +406 @@
                 }
 
-                a = account_add( irc, prpl, cmd[3], cmd[4] );
+                a = account_add( irc->b, prpl, cmd[3], cmd[4] );
                 if( cmd[5] )
                 {
@@ -419 +420 @@
                 MIN_ARGS( 2 );
 
-                if( !( a = account_get( irc, cmd[2] ) ) )
+                if( !( a = account_get( irc->b, cmd[2] ) ) )
                 {
                         irc_usermsg( irc, "Invalid account" );
@@ -441 +442 @@
                                                "set' command. Are you sure you want to delete this "
                                                "account?", a->prpl->name, a->user );
-                        query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
+                        //query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad );
                         g_free( msg );
                 }
@@ -452 +453 @@
                         irc_usermsg( irc, "Account list:" );
                 
-                for( a = irc->accounts; a; a = a->next )
+                for( a = irc->b->accounts; a; a = a->next )
                 {
                         char *con;
@@ -475 +476 @@
                 if( cmd[2] )
                 {
-                        if( ( a = account_get( irc, cmd[2] ) ) )
+                        if( ( a = account_get( irc->b, cmd[2] ) ) )
                         {
                                 if( a->ic )
@@ -484 +485 @@
                                 else
                                 {
-                                        account_on( irc, a );
+                                        account_on( irc->b, a );
                                 }
                         }
@@ -495 +496 @@
                 else
                 {
-                        if ( irc->accounts ) {
+                        if ( irc->b->accounts )
+                        {
                                 irc_usermsg( irc, "Trying to get all accounts connected..." );
                         
-                                for( a = irc->accounts; a; a = a->next )
+                                for( a = irc->b->accounts; a; a = a->next )
                                         if( !a->ic && a->auto_connect )
-                                                account_on( irc, a );
+                                                account_on( irc->b, a );
                         } 
                         else
@@ -514 +516 @@
                         irc_usermsg( irc, "Deactivating all active (re)connections..." );
                         
-                        for( a = irc->accounts; a; a = a->next )
+                        for( a = irc->b->accounts; a; a = a->next )
                         {
                                 if( a->ic )
-                                        account_off( irc, a );
+                                        account_off( irc->b, a );
                                 else if( a->reconnect )
                                         cancel_auto_reconnect( a );
                         }
                 }
-                else if( ( a = account_get( irc, cmd[2] ) ) )
+                else if( ( a = account_get( irc->b, cmd[2] ) ) )
                 {
                         if( a->ic )
                         {
-                                account_off( irc, a );
+                                account_off( irc->b, a );
                         }
                         else if( a->reconnect )
@@ -557 +559 @@
 }
 
+#if 0
 static void cmd_add( irc_t *irc, char **cmd )
 {
@@ -1222 +1225 @@
 const command_t commands[] = {
         { "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 },
-        { "account",        1, cmd_account,        0 },
         { "add",            2, cmd_add,            0 },
         { "info",           1, cmd_info,           0 },