Changes in root_commands.c [d628339:5ebff60]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
root_commands.c
rd628339 r5ebff60 460 460 461 461 for (a = irc->b->accounts; a; a = a->next) { 462 char *con = NULL, *protocol = NULL;462 char *con; 463 463 464 464 if (a->ic && (a->ic->flags & OPT_LOGGED_IN)) { … … 471 471 con = ""; 472 472 } 473 if (a->prpl == &protocol_missing) { 474 protocol = g_strdup_printf("%s (missing!)", set_getstr(&a->set, "_protocol_name")); 475 } else { 476 protocol = g_strdup(a->prpl->name); 477 } 478 479 irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, protocol, a->user, con); 480 g_free(protocol); 473 474 irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con); 481 475 482 476 i++; … … 492 486 493 487 for (a = irc->b->accounts; a; a = a->next) { 494 if (!a->ic && a->auto_connect && a->prpl != &protocol_missing) {488 if (!a->ic && a->auto_connect) { 495 489 if (strcmp(a->pass, PASSWORD_PENDING) == 0) { 496 490 irc_rootmsg(irc, "Enter password for account %s " … … 549 543 irc_rootmsg(irc, "Enter password for account %s " 550 544 "first (use /OPER)", a->tag); 551 } else if (a->prpl == &protocol_missing) {552 irc_rootmsg(irc, "Protocol `%s' not recognised (plugin may be missing or not running?)",553 set_getstr(&a->set, "_protocol_name"));554 545 } else { 555 546 account_on(irc->b, a); … … 656 647 irc_rootmsg(irc, "That account is not on-line"); 657 648 return; 658 } else if (add_on_server && !a->prpl->add_buddy) {659 irc_rootmsg(irc, "IM protocol does not support contact list modification");660 return;661 649 } 662 650 … … 729 717 s = g_strdup(bu->handle); 730 718 731 if (bu->ic->acc->prpl->remove_buddy) { 732 bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL); 733 } else { 734 irc_rootmsg(irc, "IM protocol does not support contact list modification, " 735 "removal will likely not be permanent"); 736 } 737 719 bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL); 738 720 nick_del(bu); 739 721 if (g_slist_find(irc->users, iu)) {
Note: See TracChangeset
for help on using the changeset viewer.