[gnome-dvb-daemon] grilo: Port to 0.3 API

[Sebastian Polsterl <sebp src gnome org>]

commit a4322936f0ce3be79258b19b5e9573674258e348
Author: Jens Georg <mail jensge org>
Date:   Tue Jun 14 23:37:24 2016 +0200

    grilo: Port to 0.3 API
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767703

 client/grilo-plugin/grl-dvb-daemon-exporter.c |   16 ++++++++--------
 client/grilo-plugin/grl-dvb-daemon-exporter.h |    2 +-
 client/grilo-plugin/grl-dvb-daemon-source.c   |   17 +++++++++++++----
 configure.ac                                  |    2 +-
 4 files changed, 23 insertions(+), 14 deletions(-)
---
diff --git a/client/grilo-plugin/grl-dvb-daemon-exporter.c b/client/grilo-plugin/grl-dvb-daemon-exporter.c
index 930b17a..eb8c886 100644
--- a/client/grilo-plugin/grl-dvb-daemon-exporter.c
+++ b/client/grilo-plugin/grl-dvb-daemon-exporter.c
@@ -23,7 +23,7 @@
 
 #include "grl-dvb-daemon-exporter.h"
 
-static GrlMedia * create_media_box (GrlDvbDaemonExporter *self);
+static GrlMedia * create_media_container (GrlDvbDaemonExporter *self);
 
 struct _GrlDvbDaemonExporterPrivate
 {
@@ -145,16 +145,16 @@ grl_dvb_daemon_exporter_class_init (GrlDvbDaemonExporterClass *klass)
 }
 
 static GrlMedia *
-create_media_box (GrlDvbDaemonExporter *self)
+create_media_container (GrlDvbDaemonExporter *self)
 {
-       GrlMedia * box = GRL_MEDIA (grl_media_box_new ());
-       grl_media_set_id (box, self->priv->channel_list_path);
-       grl_media_set_title (box, self->priv->name);
-       return box;
+       GrlMedia * container = GRL_MEDIA (grl_media_container_new ());
+       grl_media_set_id (container, self->priv->channel_list_path);
+       grl_media_set_title (container, self->priv->name);
+       return container;
 }
 
 GrlMedia *
-grl_dvb_daemon_exporter_get_media_box (GrlDvbDaemonExporter *self,
+grl_dvb_daemon_exporter_get_media_container (GrlDvbDaemonExporter *self,
                                          GCancellable *cancellable,
                                          GError **error)
 {
@@ -185,7 +185,7 @@ grl_dvb_daemon_exporter_get_media_box (GrlDvbDaemonExporter *self,
                g_object_unref (proxy);
        }
 
-       return create_media_box (self);
+       return create_media_container (self);
 
 on_error:
        if (proxy != NULL)
diff --git a/client/grilo-plugin/grl-dvb-daemon-exporter.h b/client/grilo-plugin/grl-dvb-daemon-exporter.h
index 394a365..91252d4 100644
--- a/client/grilo-plugin/grl-dvb-daemon-exporter.h
+++ b/client/grilo-plugin/grl-dvb-daemon-exporter.h
@@ -53,7 +53,7 @@ struct _GrlDvbDaemonExporter
 };
 
 GrlDvbDaemonExporter * grl_dvb_daemon_exporter_new (const gchar *path, GDBusConnection *bus);
-GrlMedia * grl_dvb_daemon_exporter_get_media_box (GrlDvbDaemonExporter *self,
+GrlMedia * grl_dvb_daemon_exporter_get_media_container (GrlDvbDaemonExporter *self,
                                                     GCancellable *cancellable,
                                                     GError **error);
 
diff --git a/client/grilo-plugin/grl-dvb-daemon-source.c b/client/grilo-plugin/grl-dvb-daemon-source.c
index d5e4cb7..d47e5f7 100644
--- a/client/grilo-plugin/grl-dvb-daemon-source.c
+++ b/client/grilo-plugin/grl-dvb-daemon-source.c
@@ -97,9 +97,6 @@ grl_dvb_daemon_plugin_init (GrlRegistry *registry,
        return FALSE;
 }
 
-GRL_PLUGIN_REGISTER (grl_dvb_daemon_plugin_init, NULL, DVBDAEMON_PLUGIN_ID);
-
-
 /* ================== DVB Daemon GObject ================ */
 
 static void
@@ -262,7 +259,7 @@ on_manager_get_device_groups_cb (GObject *source, GAsyncResult *res,
 
                exporter = grl_dvb_daemon_exporter_new (*object_paths,
                                                          GRL_DVB_DAEMON_SOURCE(bs->source)->priv->bus);
-               box = grl_dvb_daemon_exporter_get_media_box (exporter, NULL, &error);
+               box = grl_dvb_daemon_exporter_get_media_container (exporter, NULL, &error);
                if (box == NULL) {
                        g_object_unref (exporter);
                        goto on_error;
@@ -362,3 +359,15 @@ on_error:
        bs->callback (bs->source, bs->operation_id, NULL, 0, bs->user_data, error);
        g_error_free (error);
 }
+
+GRL_PLUGIN_DEFINE (0,3,
+                   DVBDAEMON_PLUGIN_ID,
+                   SOURCE_NAME,
+                   SOURCE_DESC,
+                   "Sebastian Pölsterl",
+                   PACKAGE_VERSION,
+                   "LGPL",
+                   PACKAGE_URL,
+                   grl_dvb_daemon_plugin_init,
+                   NULL,
+                   NULL);
diff --git a/configure.ac b/configure.ac
index 1afccf5..919fe6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ AG_GST_CHECK_MODULE_GOOD([rtpmp2tpay])
 dnl ****************
 dnl * Grilo plugin
 dnl ****************
-GRL_VERSION=0.2
+GRL_VERSION=0.3
 GRL_NAME=grilo-${GRL_VERSION}
 PKG_CHECK_MODULES([GRILO], [${GRL_NAME} gio-unix-2.0 gio-2.0 glib-2.0 gobject-2.0 gmodule-2.0],
                     HAVE_GRL=yes,