Changeset d628339 for root_commands.c

Timestamp:

2015-06-08T01:13:47Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

c82a88d

Parents:

dcfa886

Message:

Don't fail config load if a protocol is supported, just remember the data.

Otherwise things will get quite annoying when an RPC plugin is temporarily
not running. (I think things will still be quite annoying this way, but let's
see.)

File:

• root_commands.c (modified) (4 diffs)

root_commands.c

@@ -460 +460 @@
 
                 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)) {
@@ -471 +471 @@
                                 con = "";
                         }
-
-                        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++;
@@ -486 +492 @@
 
                         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 "
@@ -543 +549 @@
                         irc_rootmsg(irc, "Enter password for account %s "
                                     "first (use /OPER)", a->tag);
+                } else if (a->prpl == &protocol_missing) {
+                        irc_rootmsg(irc, "Protocol `%s' not recognised (plugin may be missing or not running?)",
+                                    set_getstr(&a->set, "_protocol_name"));
                 } else {
                         account_on(irc->b, a);