Changes in root_commands.c [f545372:9a9b520]

File:

• root_commands.c (modified) (6 diffs)

root_commands.c

@@ -105 +105 @@
 {
         storage_status_t status;
+        char *account_on[] = { "account", "on", NULL };
         gboolean load = TRUE;
         char *password = cmd[1];
@@ -157 +158 @@
                 irc_umode_set( irc, "+R", 1 );
                 irc_channel_auto_joins( irc, NULL );
-                
-                if( ipc_child_identify( irc ) )
-                {
-                        if( load && set_getbool( &irc->b->set, "auto_connect" ) )
-                                irc->login_source_id = b_timeout_add( 200,
-                                        cmd_identify_finish, irc );
-                }
-                else if( load && set_getbool( &irc->b->set, "auto_connect" ) )
-                        cmd_identify_finish( irc, 0, 0 );
-                
+                if( load && set_getbool( &irc->b->set, "auto_connect" ) )
+                        cmd_account( irc, account_on );
                 break;
         case STORAGE_OTHER_ERROR:
@@ -173 +166 @@
                 break;
         }
-}
-
-gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond )
-{
-        char *account_on[] = { "account", "on", NULL };
-        irc_t *irc = data;
-        
-        cmd_account( irc, account_on );
-        
-        irc->login_source_id = -1;
-        return FALSE;
 }
 
@@ -680 +662 @@
 static void cmd_rename( irc_t *irc, char **cmd )
 {
-        irc_user_t *iu;
+        irc_user_t *iu, *old;
         
         iu = irc_user_by_name( irc, cmd[1] );
@@ -690 +672 @@
         else if( iu == irc->user )
         {
-                irc_usermsg( irc, "Use /nick to change your own nickname" );
+                irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
         }
         else if( !nick_ok( cmd[2] ) )
@@ -696 +678 @@
                 irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
-        else if( irc_user_by_name( irc, cmd[2] ) )
+        else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
                 irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );