Changeset b4f496e for storage_xml.c

Timestamp:

2016-11-19T07:32:48Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a7baf40

Parents:

9f03c47

Message:

Improve handling of unknown protocols / missing plugins

Instead of failing to load the config, a fake prpl is created to load
the account, keep its settings, and refuse to log in with a helpful
error message.

Also added a new explain_unknown_protocol() function which returns text
which attempts to explain why a protocol is missing, handling several
typical cases, including the future removal of several dead libpurple
plugins.

That message is shown when logging in to a loaded account with a missing
protocol and when adding a new one with 'account add', with the
difference that the latter doesn't leave a placeholder fake account.

File:

• storage_xml.c (modified) (7 diffs)

storage_xml.c

@@ -60 +60 @@
 }
 
-static void handle_settings(struct xt_node *node, set_t **head)
+static void handle_settings(struct xt_node *node, set_t **head, gboolean add_unknowns)
 {
         struct xt_node *c;
@@ -70 +70 @@
 
                 if (!name) {
+                        continue;
+                }
+
+                if (add_unknowns && !set_find(head, name)) {
+                        s = set_add(head, name, NULL, NULL, NULL);
+                        s->flags |= ACC_SET_ONLINE_ONLY;
+                        s->value = g_strdup(c->text);
                         continue;
                 }
@@ -99 +106 @@
         account_t *acc;
         struct xt_node *c;
+        gboolean is_unknown = FALSE;
 
         handle = xt_find_attr(node, "handle");
@@ -111 +119 @@
                 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 = make_unknown_protocol(protocol);
+                }
+                is_unknown = (prpl->options & PRPL_OPT_UNKNOWN_PROTOCOL) != 0;
                 local = protocol_account_islocal(protocol);
         }
@@ -153 +162 @@
         g_free(password);
 
-        handle_settings(node, &acc->set);
+        handle_settings(node, &acc->set, is_unknown);
 
         for (c = node->children; (c = xt_find_node(c, "buddy")); c = c->next) {
@@ -192 +201 @@
         }
 
-        handle_settings(node, &ic->set);
+        handle_settings(node, &ic->set, FALSE);
 
         return XT_HANDLED;
@@ -270 +279 @@
         }
 
-        handle_settings(node, &xd->irc->b->set);
+        handle_settings(node, &xd->irc->b->set, FALSE);
 
 error: