Changeset d628339

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.)

Files:

• root_commands.c (modified) (4 diffs)
• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)
• storage_xml.c (modified) (5 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);

storage.c

@@ -33 +33 @@
 
 static GList *storage_backends = NULL;
+
+const struct prpl protocol_missing = {
+        .name = "_unknown",
+};
 
 void register_storage_backend(storage_t *backend)

storage.h

@@ -62 +62 @@
 G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);
 
+extern const struct prpl protocol_missing;
+
 #endif /* __STORAGE_H__ */

storage_xml.c

@@ -83 +83 @@
 }
 
+/* Use for unsupported/not-found protocols. Save settings as-is but don't allow changes. */
+static void handle_settings_raw(struct xt_node *node, set_t **head)
+{
+        struct xt_node *c;
+
+        for (c = node->children; (c = xt_find_node(c, "setting")); c = c->next) {
+                char *name = xt_find_attr(c, "name");
+
+                if (!name) {
+                        continue;
+                }
+
+                set_t *s = set_add(head, name, NULL, NULL, NULL);
+                set_setstr(head, name, c->text);
+                s->flags |= SET_HIDDEN |
+                            ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
+        }
+}
+
 static xt_status handle_account(struct xt_node *node, gpointer data)
 {
@@ -104 +123 @@
                 prpl = find_protocol(protocol);
                 if (!prpl) {
-                        irc_rootmsg(xd->irc, "Error loading user config: Protocol not found: `%s'", protocol);
-                        return XT_ABORT;
+                        irc_rootmsg(xd->irc, "Warning: Protocol not found: `%s'", protocol);
+                        prpl = (struct prpl*) &protocol_missing;
                 }
         }
@@ -123 +142 @@
                         set_setstr(&acc->set, "tag", tag);
                 }
+                if (prpl == &protocol_missing) {
+                        set_t *s = set_add(&acc->set, "_protocol_name", protocol, NULL, NULL);
+                        s->flags |= SET_HIDDEN | SET_NOSAVE |
+                                    ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
+                }
         } else {
                 g_free(pass_cr);
@@ -132 +156 @@
         g_free(password);
 
-        handle_settings(node, &acc->set);
+        if (prpl == &protocol_missing) {
+                handle_settings_raw(node, &acc->set);
+        } else {
+                handle_settings(node, &acc->set);
+        }
 
         for (c = node->children; (c = xt_find_node(c, "buddy")); c = c->next) {
@@ -308 +336 @@
 
                 cur = xt_new_node("account", NULL, NULL);
-                xt_add_attr(cur, "protocol", acc->prpl->name);
+                if (acc->prpl == &protocol_missing) {
+                        xt_add_attr(cur, "protocol", set_getstr(&acc->set, "_protocol_name"));
+                } else {
+                        xt_add_attr(cur, "protocol", acc->prpl->name);
+                }
                 xt_add_attr(cur, "handle", acc->user);
                 xt_add_attr(cur, "password", pass_b64);