[totem] Cleanup screensaver plugin definition
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] Cleanup screensaver plugin definition
- Date: Wed, 16 Jun 2010 17:51:42 +0000 (UTC)
commit 947e40f59c064c7f91b7ba13e2a1f0c1574329f8
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 16 18:43:34 2010 +0100
Cleanup screensaver plugin definition
src/plugins/screensaver/totem-screensaver.c | 39 +++------------------------
1 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/src/plugins/screensaver/totem-screensaver.c b/src/plugins/screensaver/totem-screensaver.c
index dedd7b3..2935a03 100644
--- a/src/plugins/screensaver/totem-screensaver.c
+++ b/src/plugins/screensaver/totem-screensaver.c
@@ -34,10 +34,9 @@
#include <libpeas/peas-extension-base.h>
#include <libpeas/peas-object-module.h>
#include <libpeas/peas-activatable.h>
-
-#include <gmodule.h>
#include <string.h>
+#include "totem-plugin.h"
#include "totem.h"
#include "totem-scrsaver.h"
#include "backend/bacon-video-widget.h"
@@ -67,28 +66,13 @@ typedef struct
} TotemScreensaverPluginClass;
-G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
GType totem_screensaver_plugin_get_type (void) G_GNUC_CONST;
-static void peas_activatable_iface_init (PeasActivatableInterface *iface);
static void totem_screensaver_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 (TotemScreensaverPlugin,
- totem_screensaver_plugin,
- PEAS_TYPE_EXTENSION_BASE,
- 0,
- G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
- peas_activatable_iface_init))
-
-static void
-peas_activatable_iface_init (PeasActivatableInterface *iface)
-{
- iface->activate = impl_activate;
- iface->deactivate = impl_deactivate;
-}
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_SCREENSAVER_PLUGIN,
+ TotemScreensaverPlugin,
+ totem_screensaver_plugin)
static void
totem_screensaver_plugin_class_init (TotemScreensaverPluginClass *klass)
@@ -99,11 +83,6 @@ totem_screensaver_plugin_class_init (TotemScreensaverPluginClass *klass)
}
static void
-totem_screensaver_plugin_class_finalize (TotemScreensaverPluginClass *klass)
-{
-}
-
-static void
totem_screensaver_plugin_init (TotemScreensaverPlugin *plugin)
{
plugin->scr = totem_scrsaver_new ();
@@ -229,13 +208,3 @@ impl_deactivate (PeasActivatable *plugin,
totem_scrsaver_enable (pi->scr);
}
-G_MODULE_EXPORT void
-peas_register_types (PeasObjectModule *module)
-{
- totem_screensaver_plugin_register_type (G_TYPE_MODULE (module));
-
- peas_object_module_register_extension_type (module,
- PEAS_TYPE_ACTIVATABLE,
- TOTEM_TYPE_SCREENSAVER_PLUGIN);
-}
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]