Changeset 5a8afc3 for root_commands.c

Timestamp:

2016-11-21T06:58:47Z (8 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:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -498 +498 @@
 
                 for (a = irc->b->accounts; a; a = a->next) {
-                        char *con;
+                        char *con = NULL, *protocol = NULL;
 
                         if (a->ic && (a->ic->flags & OPT_LOGGED_IN)) {
@@ -510 +510 @@
                         }
 
-                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con);
+                        if (a->prpl == &protocol_missing) {
+                                protocol = g_strdup_printf("%s (missing!)", set_getstr(&a->set, "_protocol_name"));
+                        } else {
+                                protocol = g_strdup(a->prpl->name);
+                        }
+
+                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, protocol, a->user, con);
+                        g_free(protocol);
 
                         i++;
@@ -524 +531 @@
 
                         for (a = irc->b->accounts; a; a = a->next) {
-                                if (!a->ic && a->auto_connect) {
+                                if (!a->ic && a->auto_connect && a->prpl != &protocol_missing) {
                                         if (strcmp(a->pass, PASSWORD_PENDING) == 0) {
                                                 irc_rootmsg(irc, "Enter password for account %s "
@@ -584 +591 @@
                         irc_rootmsg(irc, "Enter password for account %s "
                                     "first (use /OPER)", a->tag);
+                } else if (a->prpl == &protocol_missing) {
+                        char *proto = set_getstr(&a->set, "_protocol_name");
+                        char *msg = explain_unknown_protocol(proto);
+                        irc_rootmsg(irc, "Unknown protocol `%s'", proto);
+                        irc_rootmsg(irc, msg);
+                        g_free(msg);
                 } else {
                         account_on(irc->b, a);