[totem] Port brasero-disc-recorder plugin to libpeas
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] Port brasero-disc-recorder plugin to libpeas
- Date: Wed, 16 Jun 2010 17:27:35 +0000 (UTC)
commit 1a529aa667beee22c68276d4813317209409bf19
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 16 17:13:47 2010 +0100
Port brasero-disc-recorder plugin to libpeas
https://bugzilla.gnome.org/show_bug.cgi?id=604830
src/plugins/brasero-disc-recorder/Makefile.am | 1 +
.../brasero-disc-recorder/totem-disc-recorder.c | 39 ++++++++------------
2 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/src/plugins/brasero-disc-recorder/Makefile.am b/src/plugins/brasero-disc-recorder/Makefile.am
index 7dc84b3..5f49e87 100644
--- a/src/plugins/brasero-disc-recorder/Makefile.am
+++ b/src/plugins/brasero-disc-recorder/Makefile.am
@@ -28,6 +28,7 @@ libbrasero_disc_recorder_la_CPPFLAGS = $(common_defines)
libbrasero_disc_recorder_la_CFLAGS = \
$(DEPENDENCY_CFLAGS) \
+ $(PEAS_CFLAGS) \
$(WARN_CFLAGS) \
$(DBUS_CFLAGS) \
$(AM_CFLAGS) \
diff --git a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
index 1e45344..765640f 100644
--- a/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+++ b/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
@@ -27,6 +27,9 @@
#include <glib/gstdio.h>
#include <gmodule.h>
#include <gdk/gdkx.h>
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>
+#include <libpeas/peas-activatable.h>
#include <libxml/xmlerror.h>
#include <libxml/xmlwriter.h>
@@ -48,7 +51,7 @@ typedef struct TotemDiscRecorderPluginPrivate TotemDiscRecorderPluginPri
typedef struct
{
- TotemPlugin parent;
+ PeasExtensionBase parent;
TotemObject *totem;
@@ -60,13 +63,14 @@ typedef struct
typedef struct
{
- TotemPluginClass parent_class;
+ PeasExtensionBaseClass parent_class;
} TotemDiscRecorderPluginClass;
-G_MODULE_EXPORT GType register_totem_plugin (GTypeModule *module);
-GType totem_disc_recorder_plugin_get_type (void) G_GNUC_CONST;
+GType totem_disc_recorder_plugin_get_type (void) G_GNUC_CONST;
-TOTEM_PLUGIN_REGISTER (TotemDiscRecorderPlugin, totem_disc_recorder_plugin)
+static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_DISC_RECORDER_PLUGIN, TotemDiscRecorderPlugin, totem_disc_recorder_plugin)
static void totem_disc_recorder_plugin_burn (GtkAction *action,
TotemDiscRecorderPlugin *pi);
@@ -363,10 +367,11 @@ totem_disc_recorder_file_opened (TotemObject *totem,
}
}
-static gboolean
-impl_activate (TotemPlugin *plugin, TotemObject *totem, GError **error)
+static void
+impl_activate (PeasActivatable *plugin, GObject *object)
{
TotemDiscRecorderPlugin *pi = TOTEM_DISC_RECORDER_PLUGIN (plugin);
+ TotemObject *totem = TOTEM_OBJECT (object);
GtkUIManager *uimanager = NULL;
GtkAction *action;
char *path;
@@ -374,7 +379,7 @@ impl_activate (TotemPlugin *plugin, TotemObject *totem, GError **error)
/* make sure brasero is in the path */
path = g_find_program_in_path ("brasero");
if (!path)
- return FALSE;
+ return;
g_free (path);
//FIXME this shouldn't be necessary
@@ -469,14 +474,13 @@ impl_activate (TotemPlugin *plugin, TotemObject *totem, GError **error)
totem_disc_recorder_file_opened (totem, mrl, pi);
g_free (mrl);
}
-
- return TRUE;
}
static void
-impl_deactivate (TotemPlugin *plugin, TotemObject *totem)
+impl_deactivate (PeasActivatable *plugin, GObject *object)
{
TotemDiscRecorderPlugin *pi = TOTEM_DISC_RECORDER_PLUGIN (plugin);
+ TotemObject *totem = TOTEM_OBJECT (object);
GtkUIManager *uimanager = NULL;
pi->enabled = FALSE;
@@ -492,21 +496,8 @@ impl_deactivate (TotemPlugin *plugin, TotemObject *totem)
}
static void
-totem_disc_recorder_plugin_finalize (GObject *object)
-{
- G_OBJECT_CLASS (totem_disc_recorder_plugin_parent_class)->finalize (object);
-}
-
-static void
totem_disc_recorder_plugin_class_init (TotemDiscRecorderPluginClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- TotemPluginClass *plugin_class = TOTEM_PLUGIN_CLASS (klass);
-
- object_class->finalize = totem_disc_recorder_plugin_finalize;
-
- plugin_class->activate = impl_activate;
- plugin_class->deactivate = impl_deactivate;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]