[totem] Clean up gromit plugin definition



commit 1a989a4c2c0625465858f58c001b048e772606ff
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jun 16 18:35:41 2010 +0100

    Clean up gromit plugin definition

 src/plugins/gromit/totem-gromit.c |   35 ++---------------------------------
 1 files changed, 2 insertions(+), 33 deletions(-)
---
diff --git a/src/plugins/gromit/totem-gromit.c b/src/plugins/gromit/totem-gromit.c
index e6be98c..52df53f 100644
--- a/src/plugins/gromit/totem-gromit.c
+++ b/src/plugins/gromit/totem-gromit.c
@@ -43,8 +43,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "totem-plugin.h"
 #include "totem.h"
-
 #include "totem-interface.h"
 
 #define TOTEM_TYPE_GROMIT_PLUGIN		(totem_gromit_plugin_get_type ())
@@ -94,20 +94,11 @@ static const char *visibility_cmd[] =	{ NULL, "-v", NULL };
 \"Core Pointer\"[Button3] = \"Eraser\";					\n\
 \n"
 
-G_MODULE_EXPORT void peas_register_types	(PeasObjectModule *module);
 GType	totem_gromit_plugin_get_type		(void) G_GNUC_CONST;
 
-static void peas_activatable_iface_init		(PeasActivatableInterface *iface);
 static void totem_gromit_plugin_finalize		(GObject *object);
-static void impl_activate			(PeasActivatable *plugin, GObject *object);
-static void impl_deactivate			(PeasActivatable *plugin, GObject *object);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (TotemGromitPlugin,
-				totem_gromit_plugin,
-				PEAS_TYPE_EXTENSION_BASE,
-				0,
-				G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
-							       peas_activatable_iface_init))
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_GROMIT_PLUGIN, TotemGromitPlugin, totem_gromit_plugin)
 
 static void
 totem_gromit_plugin_class_init (TotemGromitPluginClass *klass)
@@ -118,18 +109,6 @@ totem_gromit_plugin_class_init (TotemGromitPluginClass *klass)
 }
 
 static void
-peas_activatable_iface_init (PeasActivatableInterface *iface)
-{
-	iface->activate = impl_activate;
-	iface->deactivate = impl_deactivate;
-}
-
-static void
-totem_gromit_plugin_class_finalize (TotemGromitPluginClass *klass)
-{
-}
-
-static void
 totem_gromit_plugin_init (TotemGromitPlugin *plugin)
 {
 	plugin->id = -1;
@@ -316,13 +295,3 @@ impl_deactivate	(PeasActivatable *plugin,
 	totem_gromit_clear (pi, TRUE);
 }
 
-G_MODULE_EXPORT void
-peas_register_types (PeasObjectModule *module)
-{
-	totem_gromit_plugin_register_type (G_TYPE_MODULE (module));
-
-	peas_object_module_register_extension_type (module,
-						    PEAS_TYPE_ACTIVATABLE,
-						    TOTEM_TYPE_GROMIT_PLUGIN);
-}
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]