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