Changes in root_commands.c [5a8afc3:9f03c47]

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -439 +439 @@
 
                 if (prpl == NULL) {
-                        char *msg = explain_unknown_protocol(cmd[2]);
-                        irc_rootmsg(irc, "Unknown protocol");
-                        irc_rootmsg(irc, msg);
-                        g_free(msg);
+                        if (is_protocol_disabled(cmd[2])) {
+                                irc_rootmsg(irc, "Protocol disabled in global config");
+                        } else {
+                                irc_rootmsg(irc, "Unknown protocol");
+                        }
                         return;
                 }
@@ -498 +499 @@
 
                 for (a = irc->b->accounts; a; a = a->next) {
-                        char *con = NULL, *protocol = NULL;
+                        char *con;
 
                         if (a->ic && (a->ic->flags & OPT_LOGGED_IN)) {
@@ -510 +511 @@
                         }
 
-                        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);
+                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con);
 
                         i++;
@@ -531 +525 @@
 
                         for (a = irc->b->accounts; a; a = a->next) {
-                                if (!a->ic && a->auto_connect && a->prpl != &protocol_missing) {
+                                if (!a->ic && a->auto_connect) {
                                         if (strcmp(a->pass, PASSWORD_PENDING) == 0) {
                                                 irc_rootmsg(irc, "Enter password for account %s "
@@ -591 +585 @@
                         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);