Changes in root_commands.c [f545372:9a9b520]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
root_commands.c
rf545372 r9a9b520 105 105 { 106 106 storage_status_t status; 107 char *account_on[] = { "account", "on", NULL }; 107 108 gboolean load = TRUE; 108 109 char *password = cmd[1]; … … 157 158 irc_umode_set( irc, "+R", 1 ); 158 159 irc_channel_auto_joins( irc, NULL ); 159 160 if( ipc_child_identify( irc ) ) 161 { 162 if( load && set_getbool( &irc->b->set, "auto_connect" ) ) 163 irc->login_source_id = b_timeout_add( 200, 164 cmd_identify_finish, irc ); 165 } 166 else if( load && set_getbool( &irc->b->set, "auto_connect" ) ) 167 cmd_identify_finish( irc, 0, 0 ); 168 160 if( load && set_getbool( &irc->b->set, "auto_connect" ) ) 161 cmd_account( irc, account_on ); 169 162 break; 170 163 case STORAGE_OTHER_ERROR: … … 173 166 break; 174 167 } 175 }176 177 gboolean cmd_identify_finish( gpointer data, gint fd, b_input_condition cond )178 {179 char *account_on[] = { "account", "on", NULL };180 irc_t *irc = data;181 182 cmd_account( irc, account_on );183 184 irc->login_source_id = -1;185 return FALSE;186 168 } 187 169 … … 680 662 static void cmd_rename( irc_t *irc, char **cmd ) 681 663 { 682 irc_user_t *iu ;664 irc_user_t *iu, *old; 683 665 684 666 iu = irc_user_by_name( irc, cmd[1] ); … … 690 672 else if( iu == irc->user ) 691 673 { 692 irc_usermsg( irc, " Use /nick to change your own nickname");674 irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] ); 693 675 } 694 676 else if( !nick_ok( cmd[2] ) ) … … 696 678 irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] ); 697 679 } 698 else if( irc_user_by_name( irc, cmd[2] ))680 else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu ) 699 681 { 700 682 irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
Note: See TracChangeset
for help on using the changeset viewer.