Changeset 5a8afc3 for irc_im.c


Ignore:
Timestamp:
2016-11-21T06:58:47Z (3 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
3f44e43, f8c9347
Parents:
11d4123
git-author:
dequis <dx@…> (21-11-16 06:40:54)
git-committer:
dequis <dx@…> (21-11-16 06:58:47)
Message:

Manual merge with wilmer's approach to handling missing protocols

Turns out he already implemented pretty much the same thing in the
parson branch... last year.

The differences between the two approaches are subtle (there aren't too
many ways to do this, some lines are the exact same thing) but I decided
I like his version better, so this mostly reverts a handful of my
changes while keeping others. The main advantage of his approach is that
no fake protocols are registered, no actual prpl functions are called,
and the missing prpl is a singleton constant.

New things compared to the implementation in the other branch:

  • The explain_unknown_protocol() function.
  • Fixed named chatrooms throwing a warning and losing the "account" setting when saving. See changes in irc_im.c
  • Fixed the "server" setting dropping when saving. See account.c

Differences with my previous implementation:

  • Accounts with missing protocols don't autoconnect
  • 'account list' marks them as "(missing!)"
File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc_im.c

    r11d4123 r5a8afc3  
    10141014        if (!(acc = account_get(ic->irc->b, value))) {
    10151015                return SET_INVALID;
    1016         } else if (!acc->prpl->chat_join) {
     1016        } else if (!acc->prpl->chat_join && acc->prpl != &protocol_missing) {
    10171017                irc_rootmsg(ic->irc, "Named chatrooms not supported on that account.");
    10181018                return SET_INVALID;
Note: See TracChangeset for help on using the changeset viewer.