Merge branch 'master' into patched-master

1 files changed, 16 insertions, 0 deletions

diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 40b1ed7b..e5569313 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -270,8 +270,24 @@ struct prpl {
 	void *resv5;
 };
 
+struct plugin_info
+{
+	guint abiver;
+	const char *name;
+	const char *version;
+	const char *description;
+	const char *author;
+	const char *url;
+};
+
+#ifdef WITH_PLUGINS
+G_MODULE_EXPORT GList *get_plugins();
+#endif
+
 /* 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);
 G_MODULE_EXPORT gboolean is_protocol_disabled(const char *name);