Changeset 90bbb0e

Timestamp:

2006-06-26T16:50:47Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b3c467b

Parents:

471573f

Message:

Moved the call to "account on" to the right place.

Files:

• root_commands.c (modified) (2 diffs)
• storage_text.c (modified) (1 diff)
• storage_xml.c (modified) (1 diff)

root_commands.c

@@ -127 +127 @@
 }
 
+static void cmd_account( irc_t *irc, char **cmd );
+
 static void cmd_identify( irc_t *irc, char **cmd )
 {
         storage_status_t status = storage_load( irc->nick, cmd[1], irc );
+        char *account_on[] = { "account", "on", NULL };
         
         switch (status) {
@@ -141 +144 @@
                 irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
                 irc_umode_set( irc, "+R", 1 );
+                if( set_getint( irc, "auto_connect" ) )
+                        cmd_account( irc, account_on );
                 break;
         case STORAGE_OTHER_ERROR:

storage_text.c

@@ -116 +116 @@
         }
         fclose( fp );
-        
-        if( set_getint( irc, "auto_connect" ) )
-        {
-                strcpy( s, "account on" );      /* Can't do this directly because r_c_s alters the string */
-                root_command_string( irc, ru, s, 0 );
-        }
         
         return STORAGE_OK;

storage_xml.c

@@ -333 +333 @@
         irc->status |= USTATUS_IDENTIFIED;
         
-        /* TODO: This really shouldn't be here, I think... */
-        if( set_getint( irc, "auto_connect" ) )
-        {
-                /* Can't do this directly because r_c_s alters the string */
-                strcpy( buf, "account on" );
-                root_command_string( irc, NULL, buf, 0 );
-        }
-        
         return STORAGE_OK;
 }