Mercurial > pidgin3 / changeset

--- a/doc/C-HOWTO.dox	Mon Jul 29 01:06:42 2013 +0530
+++ b/doc/C-HOWTO.dox	Mon Jul 29 11:52:27 2013 +0530
@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 static gboolean
@@ -83,7 +83,7 @@
   like described before.  Next we include glib.h, mainly for gboolean and the
   glib wrappers of the standard C types.
 
-  Next, we include plugin.h which has all the plugin specific stuff that we
+  Next, we include plugins.h which has all the plugin specific stuff that we
   need.  For example: @c PurplePlugin, @c PurplePluginInfo,
   @c PURPLE_PLUGIN_MAGIC, and @c PURPLE_INIT_PLUGIN().
 

--- a/doc/plugin-signals.dox	Mon Jul 29 01:06:42 2013 +0530
+++ b/doc/plugin-signals.dox	Mon Jul 29 11:52:27 2013 +0530
@@ -5,7 +5,7 @@
   @signal plugin-unload
  @endsignals
 
- @see plugin.h
+ @see plugins.h
 
  <hr>
 

--- a/finch/gntaccount.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/finch/gntaccount.c	Mon Jul 29 11:52:27 2013 +0530
@@ -43,7 +43,7 @@
 #include <accountopt.h>
 #include <connection.h>
 #include <notify.h>
-#include <plugin.h>
+#include <<plugins.h>>
 #include <request.h>
 #include <savedstatuses.h>
 

--- a/finch/gntplugin.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/finch/gntplugin.h	Mon Jul 29 11:52:27 2013 +0530
@@ -28,7 +28,7 @@
 
 #include <gnt.h>
 
-#include <plugin.h>
+#include <<plugins.h>>
 #include <pluginpref.h>
 
 #include <string.h>

--- a/finch/plugins/gntclipboard.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/finch/plugins/gntclipboard.c	Mon Jul 29 11:52:27 2013 +0530
@@ -35,7 +35,7 @@
 
 #include <glib.h>
 
-#include <plugin.h>
+#include <<plugins.h>>
 #include <version.h>
 #include <debug.h>
 #include <notify.h>

--- a/finch/plugins/gntgf.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/finch/plugins/gntgf.c	Mon Jul 29 11:52:27 2013 +0530
@@ -42,7 +42,7 @@
 
 #include <glib.h>
 
-#include <plugin.h>
+#include <<plugins.h>>
 #include <version.h>
 #include <buddylist.h>
 #include <conversation.h>

--- a/finch/plugins/gnttinyurl.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/finch/plugins/gnttinyurl.c	Mon Jul 29 11:52:27 2013 +0530
@@ -34,7 +34,7 @@
 
 #include <glib.h>
 
-#include <plugin.h>
+#include <<plugins.h>>
 #include <version.h>
 #include <debug.h>
 #include <notify.h>

--- a/finch/plugins/lastlog.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/finch/plugins/lastlog.c	Mon Jul 29 11:52:27 2013 +0530
@@ -23,7 +23,7 @@
 
 #include "internal.h"
 
-#include <plugin.h>
+#include <<plugins.h>>
 #include <version.h>
 
 #include <cmds.h>

--- a/libpurple/Makefile.am	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/Makefile.am	Mon Jul 29 11:52:27 2013 +0530
@@ -75,7 +75,7 @@
 	network.c \
 	ntlm.c \
 	notify.c \
-	plugin.c \
+	plugins.c \
 	pluginpref.c \
 	pounce.c \
 	prefs.c \
@@ -146,7 +146,7 @@
 	network.h \
 	notify.h \
 	ntlm.h \
-	plugin.h \
+	plugins.h \
 	pluginpref.h \
 	pounce.h \
 	prefs.h \

--- a/libpurple/core.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/core.c	Mon Jul 29 11:52:27 2013 +0530
@@ -40,7 +40,7 @@
 #include "keyring.h"
 #include "network.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "pounce.h"
 #include "prefs.h"
 #include "proxy.h"
@@ -150,8 +150,6 @@
 	/* Initialize all static protocols. */
 	static_proto_init();
 
-	purple_plugins_probe(G_MODULE_SUFFIX);
-
 	purple_keyring_init(); /* before accounts */
 	purple_theme_manager_init();
 
@@ -228,11 +226,6 @@
 	/* The SSL plugins must be uninit before they're unloaded */
 	purple_ssl_uninit();
 
-	/* Unload all non-loader, non-prpl plugins before shutting down
-	 * subsystems. */
-	purple_debug_info("main", "Unloading normal plugins\n");
-	purple_plugins_unload(PURPLE_PLUGIN_STANDARD);
-
 	/* Save .xml files, remove signals, etc. */
 	purple_smileys_uninit();
 	purple_http_uninit();
@@ -255,11 +248,6 @@
 	purple_imgstore_uninit();
 	purple_network_uninit();
 
-	/* Everything after unloading all plugins must not fail if prpls aren't
-	 * around */
-	purple_debug_info("main", "Unloading all plugins\n");
-	purple_plugins_destroy_all();
-
 	ops = purple_core_get_ui_ops();
 	if (ops != NULL && ops->quit != NULL)
 		ops->quit();

--- a/libpurple/plugin.c	Mon Jul 29 01:06:42 2013 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#include "plugin.h"
-
-#define PURPLE_PLUGIN_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_PLUGIN, PurplePluginPrivate))
-
-/** @copydoc _PurplePluginPrivate */
-typedef struct _PurplePluginPrivate  PurplePluginPrivate;
-
-/**************************************************************************
- * Private data
- **************************************************************************/
-struct _PurplePluginPrivate {
-	gboolean unloadable;
-};
-
-/* Plugin property enums */
-enum
-{
-	PROP_0,
-	PROP_UNLOADABLE,
-	PROP_LAST
-};
-
-static GPluginPluginImplementationClass *parent_class;
-
-/**************************************************************************
- * Plugin API
- **************************************************************************/
-
-
-/**************************************************************************
- * GObject code
- **************************************************************************/
-/* GObject Property names */
-#define PROP_UNLOADABLE_S  "unloadable"
-
-/* Set method for GObject properties */
-static void
-purple_plugin_set_property(GObject *obj, guint param_id, const GValue *value,
-		GParamSpec *pspec)
-{
-	PurplePlugin *plugin = PURPLE_PLUGIN(obj);
-
-	switch (param_id) {
-		case PROP_UNLOADABLE:
-			break;
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
-			break;
-	}
-}
-
-/* Get method for GObject properties */
-static void
-purple_plugin_get_property(GObject *obj, guint param_id, GValue *value,
-		GParamSpec *pspec)
-{
-	PurplePlugin *plugin = PURPLE_PLUGIN(obj);
-
-	switch (param_id) {
-		case PROP_UNLOADABLE:
-			break;
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
-			break;
-	}
-}
-
-/* GObject initialization function */
-static void
-purple_plugin_init(GTypeInstance *instance, gpointer klass)
-{
-	PurplePluginPrivate *priv = PURPLE_PLUGIN_GET_PRIVATE(instance);
-
-	priv->unloadable = TRUE;
-}
-
-/* GObject dispose function */
-static void
-purple_plugin_dispose(GObject *object)
-{
-	G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
-/* GObject finalize function */
-static void
-purple_plugin_finalize(GObject *object)
-{
-	G_OBJECT_CLASS(parent_class)->finalize(object);
-}
-
-/* Class initializer function */
-static void purple_plugin_class_init(PurplePluginClass *klass)
-{
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
-	parent_class = g_type_class_peek_parent(klass);
-
-	g_type_class_add_private(klass, sizeof(PurplePluginPrivate));
-
-	obj_class->dispose = purple_plugin_dispose;
-	obj_class->finalize = purple_plugin_finalize;
-
-	/* Setup properties */
-	obj_class->get_property = purple_plugin_get_property;
-	obj_class->set_property = purple_plugin_set_property;
-
-	g_object_class_install_property(obj_class, PROP_UNLOADABLE,
-			g_param_spec_boolean(PROP_UNLOADABLE_S, _("Unloadable"),
-				_("Whether the plugin can be unloaded or not."), TRUE,
-				G_PARAM_READWRITE)
-			);
-}
-
-GType
-purple_plugin_get_type(void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY(type == 0)) {
-		static const GTypeInfo info = {
-			.class_size = sizeof(PurplePluginClass),
-			.class_init = (GClassInitFunc)purple_plugin_class_init,
-			.instance_size = sizeof(PurplePlugin),
-			.instance_init = (GInstanceInitFunc)purple_plugin_init,
-		};
-
-		type = g_type_register_static(GPLUGIN_TYPE_PLUGIN_IMPLEMENTATION,
-		                              "PurplePlugin", &info, 0);
-	}
-
-	return type;
-}
-

--- a/libpurple/plugin.h	Mon Jul 29 01:06:42 2013 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/**
- * @file plugin.h Plugin API
- * @ingroup core
- */
-
-/* purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#ifndef _PURPLE_PLUGIN_H_
-#define _PURPLE_PLUGIN_H_
-
-#include <gplugin.h>
-
-#define PURPLE_TYPE_PLUGIN             (purple_plugin_get_type())
-#define PURPLE_PLUGIN(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PLUGIN, PurplePlugin))
-#define PURPLE_PLUGIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_PLUGIN, PurplePluginClass))
-#define PURPLE_IS_PLUGIN(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PLUGIN))
-#define PURPLE_IS_PLUGIN_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_PLUGIN))
-#define PURPLE_PLUGIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_PLUGIN, PurplePluginClass))
-
-/** @copydoc _PurplePlugin */
-typedef struct _PurplePlugin PurplePlugin;
-/** @copydoc _PurplePluginClass */
-typedef struct _PurplePluginClass PurplePluginClass;
-
-#include "pluginpref.h"
-
-/**
- * Represents a plugin that can be loaded/unloaded by libpurple.
- *
- * #PurplePlugin inherits #GPluginPluginImplementation, which holds the
- * low-level details about the plugin in a #GPluginPlugin instance.
- */
-struct _PurplePlugin {
-	/*< private >*/
-	GPluginPluginImplementation parent;
-};
-
-/**
- * PurplePluginClass:
- *
- * The base class for all #PurplePlugin's.
- */
-struct _PurplePluginClass {
-	/*< private >*/
-	GPluginPluginImplementationClass parent_class;
-
-	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
-};
-
-G_BEGIN_DECLS
-
-/**************************************************************************/
-/** @name Plugin API                                                      */
-/**************************************************************************/
-/*@{*/
-
-/**
- * Returns the GType for the PurplePlugin object.
- */
-GType purple_plugin_get_type(void);
-
-/*@}*/
-
-G_END_DECLS
-
-#endif /* _PURPLE_PLUGIN_H_ */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/plugins.c	Mon Jul 29 11:52:27 2013 +0530
@@ -0,0 +1,196 @@
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#include "plugins.h"
+
+#define PURPLE_PLUGIN_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_PLUGIN, PurplePluginPrivate))
+
+/** @copydoc _PurplePluginPrivate */
+typedef struct _PurplePluginPrivate  PurplePluginPrivate;
+
+/**************************************************************************
+ * Private data
+ **************************************************************************/
+struct _PurplePluginPrivate {
+	gboolean unloadable;
+};
+
+/* Plugin property enums */
+enum
+{
+	PROP_0,
+	PROP_UNLOADABLE,
+	PROP_LAST
+};
+
+static GPluginPluginImplementationClass *parent_class;
+
+/**************************************************************************
+ * Plugin API
+ **************************************************************************/
+
+
+/**************************************************************************
+ * GObject code
+ **************************************************************************/
+/* GObject Property names */
+#define PROP_UNLOADABLE_S  "unloadable"
+
+/* Set method for GObject properties */
+static void
+purple_plugin_set_property(GObject *obj, guint param_id, const GValue *value,
+		GParamSpec *pspec)
+{
+	PurplePlugin *plugin = PURPLE_PLUGIN(obj);
+
+	switch (param_id) {
+		case PROP_UNLOADABLE:
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
+			break;
+	}
+}
+
+/* Get method for GObject properties */
+static void
+purple_plugin_get_property(GObject *obj, guint param_id, GValue *value,
+		GParamSpec *pspec)
+{
+	PurplePlugin *plugin = PURPLE_PLUGIN(obj);
+
+	switch (param_id) {
+		case PROP_UNLOADABLE:
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
+			break;
+	}
+}
+
+/* GObject initialization function */
+static void
+purple_plugin_init(GTypeInstance *instance, gpointer klass)
+{
+	PurplePluginPrivate *priv = PURPLE_PLUGIN_GET_PRIVATE(instance);
+
+	priv->unloadable = TRUE;
+}
+
+/* GObject dispose function */
+static void
+purple_plugin_dispose(GObject *object)
+{
+	G_OBJECT_CLASS(parent_class)->dispose(object);
+}
+
+/* GObject finalize function */
+static void
+purple_plugin_finalize(GObject *object)
+{
+	G_OBJECT_CLASS(parent_class)->finalize(object);
+}
+
+/* Class initializer function */
+static void purple_plugin_class_init(PurplePluginClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+
+	g_type_class_add_private(klass, sizeof(PurplePluginPrivate));
+
+	obj_class->dispose = purple_plugin_dispose;
+	obj_class->finalize = purple_plugin_finalize;
+
+	/* Setup properties */
+	obj_class->get_property = purple_plugin_get_property;
+	obj_class->set_property = purple_plugin_set_property;
+
+	g_object_class_install_property(obj_class, PROP_UNLOADABLE,
+			g_param_spec_boolean(PROP_UNLOADABLE_S, _("Unloadable"),
+				_("Whether the plugin can be unloaded or not."), TRUE,
+				G_PARAM_READWRITE)
+			);
+}
+
+GType
+purple_plugin_get_type(void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY(type == 0)) {
+		static const GTypeInfo info = {
+			.class_size = sizeof(PurplePluginClass),
+			.class_init = (GClassInitFunc)purple_plugin_class_init,
+			.instance_size = sizeof(PurplePlugin),
+			.instance_init = (GInstanceInitFunc)purple_plugin_init,
+		};
+
+		type = g_type_register_static(GPLUGIN_TYPE_PLUGIN_IMPLEMENTATION,
+		                              "PurplePlugin", &info, 0);
+	}
+
+	return type;
+}
+
+/**************************************************************************
+ * Plugins Subsystem API
+ **************************************************************************/
+void *
+purple_plugins_get_handle(void) {
+	static int handle;
+
+	return &handle;
+}
+
+void
+purple_plugins_init(void) {
+	void *handle = purple_plugins_get_handle();
+
+	gplugin_init();
+	gplugin_plugin_manager_append_path(LIBDIR);
+	gplugin_plugin_manager_refresh();
+
+	/* TODO GPlugin already has signals for these, these should be removed once
+	        the new plugin API is properly established */
+	purple_signal_register(handle, "plugin-load",
+						 purple_marshal_VOID__POINTER,
+						 G_TYPE_NONE, 1, PURPLE_TYPE_PLUGIN);
+	purple_signal_register(handle, "plugin-unload",
+						 purple_marshal_VOID__POINTER,
+						 G_TYPE_NONE, 1, PURPLE_TYPE_PLUGIN);
+}
+
+void
+purple_plugins_uninit(void)
+{
+	void *handle = purple_plugins_get_handle();
+
+	purple_debug_info("plugins", "Unloading all plugins\n");
+	purple_plugins_destroy_all();
+
+	purple_signals_disconnect_by_handle(handle);
+	purple_signals_unregister_by_instance(handle);
+
+	gplugin_uninit();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/plugins.h	Mon Jul 29 11:52:27 2013 +0530
@@ -0,0 +1,111 @@
+/**
+ * @file plugins.h Plugins API
+ * @ingroup core
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#ifndef _PURPLE_PLUGIN_H_
+#define _PURPLE_PLUGIN_H_
+
+#include <gplugin.h>
+
+#define PURPLE_TYPE_PLUGIN             (purple_plugin_get_type())
+#define PURPLE_PLUGIN(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PLUGIN, PurplePlugin))
+#define PURPLE_PLUGIN_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_PLUGIN, PurplePluginClass))
+#define PURPLE_IS_PLUGIN(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PLUGIN))
+#define PURPLE_IS_PLUGIN_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_PLUGIN))
+#define PURPLE_PLUGIN_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_PLUGIN, PurplePluginClass))
+
+/** @copydoc _PurplePlugin */
+typedef struct _PurplePlugin PurplePlugin;
+/** @copydoc _PurplePluginClass */
+typedef struct _PurplePluginClass PurplePluginClass;
+
+#include "pluginpref.h"
+
+/**
+ * Represents a plugin that can be loaded/unloaded by libpurple.
+ *
+ * #PurplePlugin inherits #GPluginPluginImplementation, which holds the
+ * low-level details about the plugin in a #GPluginPlugin instance.
+ */
+struct _PurplePlugin {
+	/*< private >*/
+	GPluginPluginImplementation parent;
+};
+
+/**
+ * PurplePluginClass:
+ *
+ * The base class for all #PurplePlugin's.
+ */
+struct _PurplePluginClass {
+	/*< private >*/
+	GPluginPluginImplementationClass parent_class;
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+/**************************************************************************/
+/** @name Plugin API                                                      */
+/**************************************************************************/
+/*@{*/
+
+/**
+ * Returns the GType for the PurplePlugin object.
+ */
+GType purple_plugin_get_type(void);
+
+/*@}*/
+
+/**************************************************************************/
+/** @name Plugins Subsystem API                                            */
+/**************************************************************************/
+/*@{*/
+
+/**
+ * Returns the plugin subsystem handle.
+ *
+ * @return The plugin sybsystem handle.
+ */
+void *purple_plugins_get_handle(void);
+
+/**
+ * Initializes the plugin subsystem
+ */
+void purple_plugins_init(void);
+
+/**
+ * Uninitializes the plugin subsystem
+ */
+void purple_plugins_uninit(void);
+
+/*@}*/
+
+G_END_DECLS
+
+#endif /* _PURPLE_PLUGIN_H_ */

--- a/libpurple/plugins/autoaccept.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/autoaccept.c	Mon Jul 29 11:52:27 2013 +0530
@@ -31,7 +31,7 @@
 #include <glib/gstdio.h>
 
 /* Purple headers */
-#include <plugin.h>
+#include <plugins.h>
 #include <version.h>
 
 #include <buddylist.h>

--- a/libpurple/plugins/ciphertest.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/ciphertest.c	Mon Jul 29 11:52:27 2013 +0530
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 #include "util.h"
 

--- a/libpurple/plugins/codeinline.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/codeinline.c	Mon Jul 29 11:52:27 2013 +0530
@@ -21,7 +21,7 @@
  */
 
 #include "internal.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "notify.h"
 #include "util.h"
 #include "version.h"

--- a/libpurple/plugins/dbus-example.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/dbus-example.c	Mon Jul 29 11:52:27 2013 +0530
@@ -39,7 +39,7 @@
 
 #include "buddylist.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #include <stdio.h>

--- a/libpurple/plugins/debug_example.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/debug_example.c	Mon Jul 29 11:52:27 2013 +0530
@@ -48,7 +48,7 @@
  * that we're including them in alphabetical order.  This isn't necessary but
  * we do this throughout our source for consistency. */
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 /* It's more convenient to type PLUGIN_ID all the time than it is to type

--- a/libpurple/plugins/helloworld.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/helloworld.c	Mon Jul 29 11:52:27 2013 +0530
@@ -44,7 +44,7 @@
 #endif
 
 #include <notify.h>
-#include <plugin.h>
+#include <plugins.h>
 #include <version.h>
 
 /* we're adding this here and assigning it in plugin_load because we need

--- a/libpurple/plugins/idle.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/idle.c	Mon Jul 29 11:52:27 2013 +0530
@@ -27,7 +27,7 @@
 #include "connection.h"
 #include "debug.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "presence.h"
 #include "request.h"
 #include "server.h"

--- a/libpurple/plugins/ipc-test-client.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/ipc-test-client.c	Mon Jul 29 11:52:27 2013 +0530
@@ -20,7 +20,7 @@
  */
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #define IPC_TEST_CLIENT_PLUGIN_ID "core-ipc-test-client"

--- a/libpurple/plugins/ipc-test-server.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/ipc-test-server.c	Mon Jul 29 11:52:27 2013 +0530
@@ -22,7 +22,7 @@
 
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 static int

--- a/libpurple/plugins/joinpart.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/joinpart.c	Mon Jul 29 11:52:27 2013 +0530
@@ -23,7 +23,7 @@
 #include "internal.h"
 #include "conversation.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #define JOINPART_PLUGIN_ID "core-rlaager-joinpart"

--- a/libpurple/plugins/keyrings/gnomekeyring.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/keyrings/gnomekeyring.c	Mon Jul 29 11:52:27 2013 +0530
@@ -28,7 +28,7 @@
 #include "account.h"
 #include "debug.h"
 #include "keyring.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #include <gnome-keyring.h>

--- a/libpurple/plugins/keyrings/internalkeyring.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/keyrings/internalkeyring.c	Mon Jul 29 11:52:27 2013 +0530
@@ -28,7 +28,7 @@
 #include "account.h"
 #include "debug.h"
 #include "keyring.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #include "ciphers/aescipher.h"

--- a/libpurple/plugins/keyrings/kwallet.cpp	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/keyrings/kwallet.cpp	Mon Jul 29 11:52:27 2013 +0530
@@ -29,7 +29,7 @@
 #include "core.h"
 #include "debug.h"
 #include "keyring.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #include <QQueue>

--- a/libpurple/plugins/keyrings/secretservice.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/keyrings/secretservice.c	Mon Jul 29 11:52:27 2013 +0530
@@ -38,7 +38,7 @@
 #include "account.h"
 #include "debug.h"
 #include "keyring.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #include <libsecret/secret.h>

--- a/libpurple/plugins/keyrings/wincred.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/keyrings/wincred.c	Mon Jul 29 11:52:27 2013 +0530
@@ -27,7 +27,7 @@
 #include "debug.h"
 #include "internal.h"
 #include "keyring.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 #include <wincred.h>

--- a/libpurple/plugins/log_reader.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/log_reader.c	Mon Jul 29 11:52:27 2013 +0530
@@ -4,7 +4,7 @@
 
 #include "debug.h"
 #include "log.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "pluginpref.h"
 #include "prefs.h"
 #include "stringref.h"

--- a/libpurple/plugins/mono/loader/mono-helper.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/mono/loader/mono-helper.h	Mon Jul 29 11:52:27 2013 +0530
@@ -7,7 +7,7 @@
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/tokentype.h>
-#include "plugin.h"
+#include "plugins.h"
 #include "debug.h"
 
 typedef struct {

--- a/libpurple/plugins/mono/loader/mono.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/mono/loader/mono.c	Mon Jul 29 11:52:27 2013 +0530
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 #include "mono-helper.h"
 

--- a/libpurple/plugins/newline.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/newline.c	Mon Jul 29 11:52:27 2013 +0530
@@ -22,7 +22,7 @@
 
 #include <conversation.h>
 #include <debug.h>
-#include <plugin.h>
+#include <plugins.h>
 #include <signals.h>
 #include <util.h>
 #include <version.h>

--- a/libpurple/plugins/notify_example.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/notify_example.c	Mon Jul 29 11:52:27 2013 +0530
@@ -47,7 +47,7 @@
 #define PLUGIN_AUTHOR "John Bailey <rekkanoryo@cpw.pidgin.im>"
 
 #include <notify.h>
-#include <plugin.h>
+#include <plugins.h>
 #include <version.h>
 
 static PurplePlugin *notify_example = NULL;

--- a/libpurple/plugins/one_time_password.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/one_time_password.c	Mon Jul 29 11:52:27 2013 +0530
@@ -20,7 +20,7 @@
  */
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 #include "account.h"
 #include "accountopt.h"

--- a/libpurple/plugins/perl/common/module.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/perl/common/module.h	Mon Jul 29 11:52:27 2013 +0530
@@ -55,7 +55,7 @@
 #include "imgstore.h"
 #include "network.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "pluginpref.h"
 #include "pounce.h"
 #include "prefs.h"
@@ -203,7 +203,7 @@
 typedef PurpleNotifyUserInfo *	Purple__NotifyUserInfo;
 typedef PurpleNotifyUserInfoEntry *	Purple__NotifyUserInfoEntry;
 
-/* plugin.h */
+/* plugins.h */
 typedef PurplePlugin *			Purple__Plugin;
 typedef PurplePluginAction *		Purple__Plugin__Action;
 typedef PurplePluginInfo *		Purple__PluginInfo;

--- a/libpurple/plugins/perl/perl-common.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/perl/perl-common.h	Mon Jul 29 11:52:27 2013 +0530
@@ -20,7 +20,7 @@
 #ifdef _WIN32
 #undef _WIN32DEP_H_
 #endif
-#include "plugin.h"
+#include "plugins.h"
 
 #define is_hvref(o) \
 	((o) && SvROK(o) && SvRV(o) && (SvTYPE(SvRV(o)) == SVt_PVHV))

--- a/libpurple/plugins/perl/perl-handlers.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/perl/perl-handlers.h	Mon Jul 29 11:52:27 2013 +0530
@@ -2,7 +2,7 @@
 #define _PURPLE_PERL_HANDLERS_H_
 
 #include "cmds.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "prefs.h"
 #include "pluginpref.h"
 #ifdef PURPLE_GTKPERL

--- a/libpurple/plugins/perl/perl.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/perl/perl.c	Mon Jul 29 11:52:27 2013 +0530
@@ -90,7 +90,7 @@
 #endif
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "signals.h"
 #include "version.h"
 

--- a/libpurple/plugins/pluginpref_example.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/pluginpref_example.c	Mon Jul 29 11:52:27 2013 +0530
@@ -29,7 +29,7 @@
 
 #include "internal.h"
 
-#include "plugin.h"
+#include "plugins.h"
 #include "pluginpref.h"
 #include "prefs.h"
 #include "version.h"

--- a/libpurple/plugins/psychic.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/psychic.c	Mon Jul 29 11:52:27 2013 +0530
@@ -10,7 +10,7 @@
 #include "status.h"
 #include "version.h"
 
-#include "plugin.h"
+#include "plugins.h"
 #include "pluginpref.h"
 #include "prefs.h"
 

--- a/libpurple/plugins/simple.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/simple.c	Mon Jul 29 11:52:27 2013 +0530
@@ -1,6 +1,6 @@
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 
 /** Plugin id : type-author-name (to guarantee uniqueness) */

--- a/libpurple/plugins/ssl/ssl-gnutls.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Mon Jul 29 11:52:27 2013 +0530
@@ -22,7 +22,7 @@
 #include "internal.h"
 #include "debug.h"
 #include "certificate.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "sslconn.h"
 #include "version.h"
 #include "util.h"

--- a/libpurple/plugins/ssl/ssl-nss.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/ssl/ssl-nss.c	Mon Jul 29 11:52:27 2013 +0530
@@ -22,7 +22,7 @@
 #include "internal.h"
 #include "debug.h"
 #include "certificate.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "sslconn.h"
 #include "util.h"
 #include "version.h"

--- a/libpurple/plugins/ssl/ssl.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/ssl/ssl.c	Mon Jul 29 11:52:27 2013 +0530
@@ -21,7 +21,7 @@
  */
 #include "internal.h"
 #include "debug.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "sslconn.h"
 #include "version.h"
 

--- a/libpurple/plugins/statenotify.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/statenotify.c	Mon Jul 29 11:52:27 2013 +0530
@@ -6,7 +6,7 @@
 #include "signals.h"
 #include "version.h"
 
-#include "plugin.h"
+#include "plugins.h"
 #include "pluginpref.h"
 #include "prefs.h"
 

--- a/libpurple/plugins/tcl/tcl.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/tcl/tcl.c	Mon Jul 29 11:52:27 2013 +0530
@@ -38,7 +38,7 @@
 
 #include "internal.h"
 #include "connection.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "signals.h"
 #include "debug.h"
 #include "util.h"

--- a/libpurple/plugins/tcl/tcl_purple.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/plugins/tcl/tcl_purple.h	Mon Jul 29 11:52:27 2013 +0530
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "cmds.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "stringref.h"
 
 struct tcl_signal_handler {

--- a/libpurple/protocols/gg/gg.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/gg/gg.c	Mon Jul 29 11:52:27 2013 +0530
@@ -28,7 +28,7 @@
 
 #include <internal.h>
 
-#include "plugin.h"
+#include "plugins.h"
 #include "version.h"
 #include "notify.h"
 #include "buddylist.h"

--- a/libpurple/protocols/irc/irc.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/irc/irc.c	Mon Jul 29 11:52:27 2013 +0530
@@ -31,7 +31,7 @@
 #include "debug.h"
 #include "notify.h"
 #include "prpl.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "util.h"
 #include "version.h"
 

--- a/libpurple/protocols/myspace/myspace.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/myspace/myspace.h	Mon Jul 29 11:52:27 2013 +0530
@@ -39,7 +39,7 @@
 #endif
 
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "accountopt.h"
 #include "version.h"
 #include "util.h"       /* for base64 */

--- a/libpurple/protocols/oscar/visibility.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/oscar/visibility.h	Mon Jul 29 11:52:27 2013 +0530
@@ -22,7 +22,7 @@
 #define _VISIBILITY_H_
 
 #include "oscar.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "util.h"
 
 PurpleMenuAction * create_visibility_menu_item(OscarData *od, const char *bname);

--- a/libpurple/protocols/sametime/sametime.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/sametime/sametime.c	Mon Jul 29 11:52:27 2013 +0530
@@ -40,7 +40,7 @@
 #include "imgstore.h"
 #include "mime.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "prpl.h"
 #include "request.h"
 #include "util.h"

--- a/libpurple/protocols/simple/simple.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/simple/simple.c	Mon Jul 29 11:52:27 2013 +0530
@@ -33,7 +33,7 @@
 #include "debug.h"
 #include "notify.h"
 #include "prpl.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "util.h"
 #include "version.h"
 #include "network.h"

--- a/libpurple/protocols/simple/sipmsg.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/protocols/simple/sipmsg.c	Mon Jul 29 11:52:27 2013 +0530
@@ -28,7 +28,7 @@
 #include "debug.h"
 #include "notify.h"
 #include "prpl.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "util.h"
 #include "version.h"
 

--- a/libpurple/prpl.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/prpl.h	Mon Jul 29 11:52:27 2013 +0530
@@ -78,7 +78,7 @@
 #include "media.h"
 #include "notify.h"
 #include "proxy.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "roomlist.h"
 #include "status.h"
 #include "whiteboard.h"

--- a/libpurple/purple.h.in	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/purple.h.in	Mon Jul 29 11:52:27 2013 +0530
@@ -71,7 +71,7 @@
 #include <network.h>
 #include <notify.h>
 #include <ntlm.h>
-#include <plugin.h>
+#include <plugins.h>
 #include <pluginpref.h>
 #include <pounce.h>
 #include <prefs.h>

--- a/libpurple/util.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/libpurple/util.h	Mon Jul 29 11:52:27 2013 +0530
@@ -50,7 +50,7 @@
 #include "signals.h"
 #include "xmlnode.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 
 
 typedef char *(*PurpleInfoFieldFormatCallback)(const char *field, size_t len);

--- a/pidgin/gtkaccount.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/gtkaccount.c	Mon Jul 29 11:52:27 2013 +0530
@@ -32,7 +32,7 @@
 #include "core.h"
 #include "debug.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "prefs.h"
 #include "prpl.h"
 #include "request.h"

--- a/pidgin/gtkblist.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/gtkblist.c	Mon Jul 29 11:52:27 2013 +0530
@@ -34,7 +34,7 @@
 #include "notify.h"
 #include "prpl.h"
 #include "prefs.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "request.h"
 #include "signals.h"
 #include "pidginstock.h"

--- a/pidgin/gtkdialogs.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/gtkdialogs.c	Mon Jul 29 11:52:27 2013 +0530
@@ -31,7 +31,7 @@
 
 #include "debug.h"
 #include "notify.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "prpl.h"
 #include "request.h"
 #include "util.h"

--- a/pidgin/gtkplugin.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/gtkplugin.h	Mon Jul 29 11:52:27 2013 +0530
@@ -27,7 +27,7 @@
 #define _PIDGINPLUGIN_H_
 
 #include "pidgin.h"
-#include "plugin.h"
+#include "plugins.h"
 
 typedef struct _PidginPluginUiInfo PidginPluginUiInfo;
 

--- a/pidgin/plugins/crazychat/cc_pidgin_plugin.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/plugins/crazychat/cc_pidgin_plugin.c	Mon Jul 29 11:52:27 2013 +0530
@@ -2,7 +2,7 @@
 #include <assert.h>
 
 #include "internal.h"
-#include "plugin.h"
+#include "plugins.h"
 #include "gtkplugin.h"
 #include "gtkblist.h"
 #include "gtkutils.h"

--- a/pidgin/plugins/disco/xmppdisco.h	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/plugins/disco/xmppdisco.h	Mon Jul 29 11:52:27 2013 +0530
@@ -32,7 +32,7 @@
 #define NS_MUC              "http://jabber.org/protocol/muc"
 #define NS_REGISTER         "jabber:iq:register"
 
-#include "plugin.h"
+#include "plugins.h"
 extern PurplePlugin *my_plugin;
 
 /**

--- a/pidgin/plugins/pidgininc.c	Mon Jul 29 01:06:42 2013 +0530
+++ b/pidgin/plugins/pidgininc.c	Mon Jul 29 11:52:27 2013 +0530
@@ -1,5 +1,5 @@
 #include "internal.h"
-#include "plugin.h"
+#include "plugins.h"
 
 #include "account.h"
 #include "connection.h"