Changes in root_commands.c [7adc657:1195cec]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
root_commands.c
r7adc657 r1195cec 204 204 } 205 205 206 struct cmd_account_del_data 207 { 208 account_t *a; 209 irc_t *irc; 210 }; 211 212 void cmd_account_del_yes( void *data ) 213 { 214 struct cmd_account_del_data *cad = data; 215 account_t *a; 216 217 for( a = cad->irc->accounts; a && a != cad->a; a = a->next ); 218 219 if( a == NULL ) 220 { 221 irc_usermsg( cad->irc, "Account already deleted" ); 222 } 223 else if( a->ic ) 224 { 225 irc_usermsg( cad->irc, "Account is still logged in, can't delete" ); 226 } 227 else 228 { 229 account_del( cad->irc, a ); 230 irc_usermsg( cad->irc, "Account deleted" ); 231 } 232 g_free( data ); 233 } 234 235 void cmd_account_del_no( void *data ) 236 { 237 g_free( data ); 238 } 239 206 240 static void cmd_account( irc_t *irc, char **cmd ) 207 241 { … … 258 292 else 259 293 { 260 account_del( irc, a ); 261 irc_usermsg( irc, "Account deleted" ); 294 struct cmd_account_del_data *cad; 295 char *msg; 296 297 cad = g_malloc( sizeof( struct cmd_account_del_data ) ); 298 cad->a = a; 299 cad->irc = irc; 300 301 msg = g_strdup_printf( "If you remove this account (%s(%s)), BitlBee will " 302 "also forget all your saved nicknames. If you want " 303 "to change your username/password, use the `account " 304 "set' command. Are you sure you want to delete this " 305 "account?", a->prpl->name, a->user ); 306 query_add( irc, NULL, msg, cmd_account_del_yes, cmd_account_del_no, cad ); 307 g_free( msg ); 262 308 } 263 309 } … … 557 603 g_free( irc->mynick ); 558 604 irc->mynick = g_strdup( cmd[2] ); 605 606 if( strcmp( cmd[0], "set_rename" ) != 0 ) 607 set_setstr( &irc->set, "root_nick", cmd[2] ); 559 608 } 560 609 else if( u->send_handler == buddy_send_handler ) … … 565 614 irc_usermsg( irc, "Nick successfully changed" ); 566 615 } 616 } 617 618 char *set_eval_root_nick( set_t *set, char *new_nick ) 619 { 620 irc_t *irc = set->data; 621 622 if( strcmp( irc->mynick, new_nick ) != 0 ) 623 { 624 char *cmd[] = { "set_rename", irc->mynick, new_nick, NULL }; 625 626 cmd_rename( irc, cmd ); 627 } 628 629 return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : NULL; 567 630 } 568 631 … … 769 832 else 770 833 irc_usermsg( irc, "%s is empty", set_name ); 834 835 if( strchr( set_name, '/' ) ) 836 irc_usermsg( irc, "Warning: / found in setting name, you're probably looking for the `account set' command." ); 771 837 } 772 838 else
Note: See TracChangeset
for help on using the changeset viewer.