Changeset 3f44e43 for root_commands.c

Timestamp:

2016-11-21T07:49:26Z (8 years ago)

Author:

dequis <dx@…>

Children:

7a9d968

Parents:

537d9b9 (diff), 5a8afc3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -439 +439 @@
 
                 if (prpl == NULL) {
-                        if (is_protocol_disabled(cmd[2])) {
-                                irc_rootmsg(irc, "Protocol disabled in global config");
-                        } else {
-                                irc_rootmsg(irc, "Unknown protocol");
-                        }
+                        char *msg = explain_unknown_protocol(cmd[2]);
+                        irc_rootmsg(irc, "Unknown protocol");
+                        irc_rootmsg(irc, msg);
+                        g_free(msg);
                         return;
                 }
@@ -592 +591 @@
                                     "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"));
+                        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);