Changeset 6d212f4

Timestamp:

2016-12-26T00:20:09Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

59ccef5

Parents:

7486853

git-author:

dequis <dx@…> (25-12-16 23:41:13)

git-committer:

dequis <dx@…> (26-12-16 00:20:09)

Message:

purple: include purple plugins in the 'plugins' command list

Files:

• protocols/purple/purple.c (modified) (3 diffs)
• root_commands.c (modified) (1 diff)

protocols/purple/purple.c

@@ -1640 +1640 @@
         }
 }
+
+/* borrowing this semi-private function
+ * TODO: figure out a better interface later (famous last words) */
+gboolean plugin_info_add(struct plugin_info *info);
 
 void purple_initmodule()
@@ -1741 +1745 @@
                 PurplePluginProtocolInfo *pi = prot->info->extra_info;
                 struct prpl *ret;
+                struct plugin_info *info;
 
                 /* If we already have this one (as a native module), don't
@@ -1775 +1780 @@
                         register_protocol(ret);
                 }
+
+                info = g_new0(struct plugin_info, 1);
+                info->abiver = BITLBEE_ABI_VERSION_CODE;
+                info->name = ret->name;
+                info->version = prot->info->version;
+                info->description = prot->info->description;
+                info->author = prot->info->author;
+                info->url = prot->info->homepage;
+
+                plugin_info_add(info);
         }
 

root_commands.c

@@ -1222 +1222 @@
 
         for (l = get_plugins(); l; l = l->next) {
+                char *c;
                 info = l->data;
-                irc_rootmsg(irc, format, info->name, info->version);
+
+                /* some purple plugins like to include several versions separated by newlines... */
+                if ((c = strchr(info->version, '\n'))) {
+                        char *version = g_strndup(info->version, c - info->version);
+                        irc_rootmsg(irc, format, info->name, version);
+                        g_free(version);
+                } else {
+                        irc_rootmsg(irc, format, info->name, info->version);
+                }
         }
 #endif