[rhythmbox/mallard-help] daap: fix build errors

[Sindhu S <sindhus src gnome org>]

commit 8ace23d3295ac9ba2d40ef6d971668567e5bb6be
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Feb 27 06:52:52 2013 +1000

    daap: fix build errors

 plugins/daap/rb-daap-plugin.c |    1 -
 plugins/daap/rb-daap-source.c |    8 ++++++--
 plugins/daap/rb-daap-src.c    |   15 ++++++++-------
 plugins/daap/rb-daap-src.h    |    2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/plugins/daap/rb-daap-plugin.c b/plugins/daap/rb-daap-plugin.c
index b2f115f..599582a 100644
--- a/plugins/daap/rb-daap-plugin.c
+++ b/plugins/daap/rb-daap-plugin.c
@@ -172,7 +172,6 @@ impl_activate (PeasActivatable *bplugin)
        gboolean no_registration;
        RBShell *shell;
        GApplication *app;
-       GMenuModel *menu;
 
        plugin->shutdown = FALSE;
 
diff --git a/plugins/daap/rb-daap-source.c b/plugins/daap/rb-daap-source.c
index 8140eba..fb034f9 100644
--- a/plugins/daap/rb-daap-source.c
+++ b/plugins/daap/rb-daap-source.c
@@ -51,6 +51,8 @@
 #include "rb-daap-record-factory.h"
 #include "rb-rhythmdb-dmap-db-adapter.h"
 #include "rb-display-page.h"
+#include "rb-builder-helpers.h"
+#include "rb-application.h"
 
 #include "rb-daap-plugin.h"
 
@@ -61,6 +63,7 @@
 typedef struct _RhythmDBEntryType RBDAAPEntryType;
 typedef struct _RhythmDBEntryTypeClass RBDAAPEntryTypeClass;
 
+static void rb_daap_source_constructed (GObject *object);
 static void rb_daap_source_dispose (GObject *object);
 static void rb_daap_source_set_property  (GObject *object,
                                          guint prop_id,
@@ -169,6 +172,7 @@ rb_daap_source_class_init (RBDAAPSourceClass *klass)
        RBSourceClass *source_class = RB_SOURCE_CLASS (klass);
        RBBrowserSourceClass *browser_source_class = RB_BROWSER_SOURCE_CLASS (klass);
 
+       object_class->constructed  = rb_daap_source_constructed;
        object_class->dispose      = rb_daap_source_dispose;
        object_class->finalize     = rb_daap_source_finalize;
        object_class->get_property = rb_daap_source_get_property;
@@ -292,7 +296,7 @@ rb_daap_source_get_property (GObject *object,
 }
 
 static void
-impl_constructed (GObject *object)
+rb_daap_source_constructed (GObject *object)
 {
        RBShell *shell;
        GActionEntry actions[] = {
@@ -816,7 +820,7 @@ rb_daap_source_disconnect (RBDAAPSource *daap_source)
 static void
 disconnect_action_cb (GSimpleAction *action, GVariant *parameter, gpointer data)
 {
-       RBDaapSource *source = RB_DAAP_SOURCE (data);
+       RBDAAPSource *source = RB_DAAP_SOURCE (data);
        rb_daap_source_disconnect (source);
 }
 
diff --git a/plugins/daap/rb-daap-src.c b/plugins/daap/rb-daap-src.c
index 3db76dc..99a55ca 100644
--- a/plugins/daap/rb-daap-src.c
+++ b/plugins/daap/rb-daap-src.c
@@ -330,30 +330,31 @@ rb_register_gst_plugin ()
 /*** GSTURIHANDLER INTERFACE *************************************************/
 
 static GstURIType
-rb_daap_src_uri_get_type (void)
+rb_daap_src_uri_get_type (GType type)
 {
        return GST_URI_SRC;
 }
 
-static gchar **
-rb_daap_src_uri_get_protocols (void)
+static const gchar * const *
+rb_daap_src_uri_get_protocols (GType type)
 {
-       static gchar *protocols[] = {"daap", NULL};
+       static const gchar * const protocols[] = {"daap", NULL};
 
        return protocols;
 }
 
-static const gchar *
+static gchar *
 rb_daap_src_uri_get_uri (GstURIHandler *handler)
 {
        RBDAAPSrc *src = RB_DAAP_SRC (handler);
 
-       return src->daap_uri;
+       return g_strdup (src->daap_uri);
 }
 
 static gboolean
 rb_daap_src_uri_set_uri (GstURIHandler *handler,
-                        const gchar *uri)
+                        const gchar *uri,
+                        GError **error)
 {
        RBDAAPSrc *src = RB_DAAP_SRC (handler);
 
diff --git a/plugins/daap/rb-daap-src.h b/plugins/daap/rb-daap-src.h
index a693d62..e53e1a5 100644
--- a/plugins/daap/rb-daap-src.h
+++ b/plugins/daap/rb-daap-src.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 GType rb_daap_src_get_type (void);
 void rb_daap_src_set_plugin (GObject *plugin);
 
-gboolean rb_register_gst_plugin ();
+gboolean rb_register_gst_plugin (void);
 
 G_END_DECLS