Changeset 808825e

Timestamp:

2016-05-26T02:48:08Z (8 years ago)

Author:

jgeboski <jgeboski@…>

Branches:

master

Children:

35712b7

Parents:

d28fe1c4

git-author:

jgeboski <jgeboski@…> (15-05-16 20:40:15)

git-committer:

jgeboski <jgeboski@…> (26-05-16 02:48:08)

Message:

Show the enabled/disabled protocols in the 'plugins' command output

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• protocols/nogaim.h (modified) (1 diff)
• root_commands.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -1836 +1836 @@
 
         <bitlbee-command name="plugins">
-                <short-description>List all the external plugins</short-description>
+                <short-description>List all the external plugins and protocols</short-description>
                 <syntax>plugins</syntax>
 
                 <description>
                         <para>
-                                This gives you a list of all the external plugins.
+                                This gives you a list of all the external plugins and protocols.
                         </para>
                 </description>

protocols/nogaim.c

@@ -228 +228 @@
         load_plugins();
 #endif
+}
+
+GList *get_protocols()
+{
+        return protocols;
+}
+
+GList *get_protocols_disabled()
+{
+        return disabled_protocols;
 }
 

protocols/nogaim.h

@@ -287 +287 @@
 /* im_api core stuff. */
 void nogaim_init();
+G_MODULE_EXPORT GList *get_protocols();
+G_MODULE_EXPORT GList *get_protocols_disabled();
 G_MODULE_EXPORT GSList *get_connections();
 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);

root_commands.c

@@ -1107 +1107 @@
 }
 
+static gint prplcmp(gconstpointer a, gconstpointer b)
+{
+        const struct prpl *pa = a;
+        const struct prpl *pb = b;
+
+        return g_strcasecmp(pa->name, pb->name);
+}
+
+static void prplstr(GList *prpls, GString *gstr)
+{
+        const char *last = NULL;
+        GList *l;
+        struct prpl *p;
+
+        prpls = g_list_copy(prpls);
+        prpls = g_list_sort(prpls, prplcmp);
+
+        for (l = prpls; l; l = l->next) {
+                p = l->data;
+
+                if (last && g_strcasecmp(p->name, last) == 0) {
+                        /* Ignore duplicates (mainly for libpurple) */
+                        continue;
+                }
+
+                if (gstr->len != 0) {
+                        g_string_append(gstr, ", ");
+                }
+
+                g_string_append(gstr, p->name);
+                last = p->name;
+        }
+
+        g_list_free(prpls);
+}
+
+static void cmd_plugins(irc_t *irc, char **cmd)
+{
+        GList *prpls;
+        GString *gstr;
+
 #ifdef WITH_PLUGINS
-static void cmd_plugins(irc_t *irc, char **cmd)
-{
         GList *l;
         struct plugin_info *info;
@@ -1130 +1169 @@
                 }
 
-                if (l->next) {
-                        irc_rootmsg(irc, "");
-                }
-        }
-}
+                irc_rootmsg(irc, "");
+        }
 #endif
+
+        gstr = g_string_new(NULL);
+        prpls = get_protocols();
+
+        if (prpls) {
+                prplstr(prpls, gstr);
+                irc_rootmsg(irc, "Enabled Protocols: %s", gstr->str);
+                g_string_truncate(gstr, 0);
+        }
+
+        prpls = get_protocols_disabled();
+
+        if (prpls) {
+                prplstr(prpls, gstr);
+                irc_rootmsg(irc, "Disabled Protocols: %s", gstr->str);
+        }
+
+        g_string_free(gstr, TRUE);
+}
 
 static void cmd_qlist(irc_t *irc, char **cmd)
@@ -1388 +1443 @@
         { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
-#ifdef WITH_PLUGINS
         { "plugins",        0, cmd_plugins,        0 },
-#endif
         { "qlist",          0, cmd_qlist,          0 },
         { "register",       0, cmd_register,       0 },