[totem] Port mythtv plugin to libpeas
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] Port mythtv plugin to libpeas
- Date: Wed, 16 Jun 2010 17:28:10 +0000 (UTC)
commit e23c7dcef33a95bca3d0cf3b299cead2adcf569c
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jun 16 17:57:20 2010 +0100
Port mythtv plugin to libpeas
https://bugzilla.gnome.org/show_bug.cgi?id=604830
src/plugins/mythtv/Makefile.am | 1 +
src/plugins/mythtv/totem-mythtv.c | 32 ++++++++++++--------------------
2 files changed, 13 insertions(+), 20 deletions(-)
---
diff --git a/src/plugins/mythtv/Makefile.am b/src/plugins/mythtv/Makefile.am
index eecf45e..13d10d1 100644
--- a/src/plugins/mythtv/Makefile.am
+++ b/src/plugins/mythtv/Makefile.am
@@ -37,6 +37,7 @@ libtotem_mythtv_la_LIBADD = $(GMYTH_LIBS)
libtotem_mythtv_la_CFLAGS = \
$(DEPENDENCY_CFLAGS) \
+ $(PEAS_CFLAGS) \
$(GMYTH_CFLAGS) \
$(WARN_CFLAGS) \
$(DBUS_CFLAGS) \
diff --git a/src/plugins/mythtv/totem-mythtv.c b/src/plugins/mythtv/totem-mythtv.c
index a3d87d1..36847ac 100644
--- a/src/plugins/mythtv/totem-mythtv.c
+++ b/src/plugins/mythtv/totem-mythtv.c
@@ -71,7 +71,7 @@ enum {
typedef struct
{
- TotemPlugin parent;
+ PeasExtensionBase parent;
GList *lst_b_info;
GMythUPnP *upnp;
@@ -85,19 +85,16 @@ typedef struct
typedef struct
{
- TotemPluginClass parent_class;
+ PeasExtensionBaseClass parent_class;
} TotemMythtvPluginClass;
-G_MODULE_EXPORT GType register_totem_plugin (GTypeModule *module);
GType totem_mythtv_plugin_get_type (void) G_GNUC_CONST;
static void totem_mythtv_plugin_init (TotemMythtvPlugin *plugin);
static void totem_mythtv_plugin_finalize (GObject *object);
-static gboolean impl_activate (TotemPlugin *plugin, TotemObject *totem, GError **error);
-static void impl_deactivate (TotemPlugin *plugin, TotemObject *totem);
-TOTEM_PLUGIN_REGISTER(TotemMythtvPlugin, totem_mythtv_plugin)
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_MYTHTV_PLUGIN, TotemMythtvPlugin, totem_mythtv_plugin)
#define MAX_THUMB_SIZE 500 * 1024 * 1024
#define THUMB_HEIGHT 32
@@ -344,12 +341,8 @@ static void
totem_mythtv_plugin_class_init (TotemMythtvPluginClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- TotemPluginClass *plugin_class = TOTEM_PLUGIN_CLASS (klass);
object_class->finalize = totem_mythtv_plugin_finalize;
-
- plugin_class->activate = impl_activate;
- plugin_class->deactivate = impl_deactivate;
}
static void
@@ -511,12 +504,12 @@ add_sidebar (TotemMythtvPlugin *tm, const char *name, const char *label)
return g_object_ref (box);
}
-static gboolean
-impl_activate (TotemPlugin *plugin,
- TotemObject *totem,
- GError **error)
+static void
+impl_activate (PeasActivatable *plugin,
+ GObject *object)
{
TotemMythtvPlugin *tm = TOTEM_MYTHTV_PLUGIN(plugin);
+ TotemObject *totem = TOTEM_OBJECT (object);
tm->totem = g_object_ref (totem);
@@ -532,17 +525,16 @@ impl_activate (TotemPlugin *plugin,
totem_mythtv_list_livetv (TOTEM_MYTHTV_PLUGIN(plugin));
gdk_window_set_cursor (box->window, NULL);
#endif
- return TRUE;
}
static void
-impl_deactivate (TotemPlugin *plugin,
- TotemObject *totem)
+impl_deactivate (PeasActivatable *plugin,
+ GObject *object)
{
TotemMythtvPlugin *tm = TOTEM_MYTHTV_PLUGIN(plugin);
- totem_remove_sidebar_page (totem, MYTHTV_SIDEBAR_RECORDINGS);
- totem_remove_sidebar_page (totem, MYTHTV_SIDEBAR_LIVETV);
+ totem_remove_sidebar_page (tm->totem, MYTHTV_SIDEBAR_RECORDINGS);
+ totem_remove_sidebar_page (tm->totem, MYTHTV_SIDEBAR_LIVETV);
if (tm->lst_b_info != NULL) {
g_list_foreach (tm->lst_b_info, (GFunc ) g_object_unref, NULL);
@@ -565,6 +557,6 @@ impl_deactivate (TotemPlugin *plugin,
gtk_widget_destroy (tm->sidebar_livetv);
tm->sidebar_livetv = NULL;
}
- g_object_unref (totem);
+ g_object_unref (tm->totem);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]