[rhythmbox] fix some vala and dist problems

[Jonathan Matthew <jmatthew src gnome org>]

commit 1efb2ff5e53a329be2f06bde0b7e8699a5134e38
Author: Rico Tzschichholz <ricotz t-online de>
Date:   Mon Jul 25 20:32:07 2011 +1000

    fix some vala and dist problems

 bindings/vala/rb.vapi                          |   10 +++++-----
 bindings/vala/rhythmdb.vapi                    |    2 +-
 configure.ac                                   |    2 --
 data/Makefile.am                               |    2 +-
 plugins/rb/Makefile.am                         |    2 ++
 plugins/sample-vala/Makefile.am                |    2 +-
 plugins/sample-vala/rb-sample-vala-plugin.vala |    8 ++++++--
 7 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/bindings/vala/rb.vapi b/bindings/vala/rb.vapi
index ad6ecbf..411ac8b 100644
--- a/bindings/vala/rb.vapi
+++ b/bindings/vala/rb.vapi
@@ -114,22 +114,22 @@ namespace RB {
 	public class ShellPlayer : Gtk.HBox {
 
 		[CCode (cname = "rb_shell_player_pause")]
-		public bool pause(ref GLib.Error? err = null);
+		public bool pause(ref GLib.Error? err);
 
 		[CCode (cname = "rb_shell_player_play")]
-		public bool play(ref GLib.Error? err = null);
+		public bool play(ref GLib.Error? err);
 
 		[CCode (cname = "rb_shell_player_stop")]
 		public bool stop();
 
 		[CCode (cname = "rb_shell_player_get_playing")]
-		public bool get_playing(ref bool playing, ref GLib.Error? err = null);
+		public bool get_playing(ref bool playing, ref GLib.Error? err);
 
 		[CCode (cname = "rb_shell_player_do_next")]
-		public bool do_next(ref GLib.Error? err = null);
+		public bool do_next(ref GLib.Error? err);
 
 		[CCode (cname = "rb_shell_player_do_previous")]
-		public bool do_previous(ref GLib.Error? err = null);
+		public bool do_previous(ref GLib.Error? err);
 
 		public virtual signal void playing_changed(bool playing);
 	}
diff --git a/bindings/vala/rhythmdb.vapi b/bindings/vala/rhythmdb.vapi
index 81f4fd8..1c8f05c 100644
--- a/bindings/vala/rhythmdb.vapi
+++ b/bindings/vala/rhythmdb.vapi
@@ -108,7 +108,7 @@ namespace RhythmDB
 		public unowned string get_playback_uri (Entry entry);
 		public void update_availability (Entry entry, EntryAvailability avail);
 		public bool can_sync_metadata (Entry entry);
-		public void sync_metadata (Entry entry, GLib.SList<EntryChange> changes, ref GLib.Error? err = null);
+		public void sync_metadata (Entry entry, GLib.SList<EntryChange> changes, ref GLib.Error? err);
 	}
 
 	[Compact]
diff --git a/configure.ac b/configure.ac
index 2287cf8..e47f81e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -834,8 +834,6 @@ sources/sync/Makefile
 plugins/Makefile
 plugins/sample/Makefile
 plugins/audiocd/Makefile
-plugins/coherence/Makefile
-plugins/coherence/upnp_coherence/Makefile
 plugins/audioscrobbler/Makefile
 plugins/brasero-disc-recorder/Makefile
 plugins/daap/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 17c9555..ff52c31 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -52,7 +52,7 @@ update-icon-cache:
 	fi
 
 EXTRA_DIST = $(service_in_files)    \
-	     $(schema_DATA)	    \
+	     $(gsettings_SCHEMAS)   \
 	     $(man_MANS)            \
 	     $(playlists_in_files)  \
 	     $(profiles_DATA)       \
diff --git a/plugins/rb/Makefile.am b/plugins/rb/Makefile.am
index 569c407..12c680d 100644
--- a/plugins/rb/Makefile.am
+++ b/plugins/rb/Makefile.am
@@ -8,3 +8,5 @@ plugin_PYTHON = \
 		rb.py
 
 plugin_DATA = rb.plugin
+
+EXTRA_DIST = $(plugin_DATA)
diff --git a/plugins/sample-vala/Makefile.am b/plugins/sample-vala/Makefile.am
index 00e874d..18bfaf5 100644
--- a/plugins/sample-vala/Makefile.am
+++ b/plugins/sample-vala/Makefile.am
@@ -37,7 +37,7 @@ plugin_in_files = sample-vala.plugin.in
 
 %.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po); $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-VALAFLAGS = --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb --pkg=gstreamer-0.10
+VALAFLAGS = --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb --pkg=gstreamer-0.10 --pkg=libpeas-1.0
 
 %.c %.h: %.vala
 	$(VALAC) -C $(VALAFLAGS) $^
diff --git a/plugins/sample-vala/rb-sample-vala-plugin.vala b/plugins/sample-vala/rb-sample-vala-plugin.vala
index 7d9eaf0..df6c783 100644
--- a/plugins/sample-vala/rb-sample-vala-plugin.vala
+++ b/plugins/sample-vala/rb-sample-vala-plugin.vala
@@ -2,13 +2,17 @@ using GLib;
 using RB;
 
 class SampleValaPlugin: Peas.ExtensionBase, Peas.Activatable {
-	public override void activate () {
+	public void activate () {
 		stdout.printf ("Hello world\n");
 	}
 
-	public override void deactivate () {
+	public void deactivate () {
 		stdout.printf ("Goodbye world\n");
 	}
+
+	public void update_state () {
+		stdout.printf ("Update world\n");
+	}
 }