[tracker] distcheck: Fixed first round of issues

[Martyn James Russell <mr src gnome org>]

commit f9b268acd9c8544b6192f0b86d4a6c6e3ac0f745
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Apr 1 13:38:33 2010 +0100

    distcheck: Fixed first round of issues

 src/libtracker-client/Makefile.am       |   38 +++++-----
 src/libtracker-miner/Makefile.am        |   50 ++++++++------
 src/libtracker-miner/tracker-miner.vapi |  121 +++++++++++++++++++++++++++++++
 3 files changed, 170 insertions(+), 39 deletions(-)
---
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index b66c249..3bfb826 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -1,13 +1,13 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 					\
-	-DLOCALEDIR=\""$(localedir)"\" 		\
-	-DG_LOG_DOMAIN=\"Tracker\"		\
-	-DTRACKER_COMPILATION			\
-	-I$(top_srcdir)/src			\
-	$(WARN_CFLAGS)				\
-	$(GLIB2_CFLAGS)				\
-	$(GCOV_CFLAGS)				\
+INCLUDES = 						\
+	-DLOCALEDIR=\""$(localedir)"\" 			\
+	-DG_LOG_DOMAIN=\"Tracker\"			\
+	-DTRACKER_COMPILATION				\
+	-I$(top_srcdir)/src				\
+	$(WARN_CFLAGS)					\
+	$(GLIB2_CFLAGS)					\
+	$(GCOV_CFLAGS)					\
 	$(DBUS_CFLAGS)			
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
@@ -48,8 +48,15 @@ dbus_sources = 						\
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
+# Vala bindings
 vapidir = $(datadir)/vala/vapi
+vapi_DATA =                     			\
+	tracker-client-$(TRACKER_API_VERSION).vapi
+
+tracker-client-$(TRACKER_API_VERSION).vapi: tracker-client.vapi
+	cp $< $@
 
+# Vala sources
 vapi_sources =						\
 	$(top_srcdir)/src/vapi/posix.vapi		\
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
@@ -58,25 +65,20 @@ libtracker-client.vala.stamp: $(libtracker_client_ TRACKER_API_VERSION@_la_VALAS
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-sparql-builder.h $^
 	$(AM_V_GEN)touch $@
 
-dist_vapi_DATA = 					\
-	tracker-client-$(TRACKER_API_VERSION).vapi
-
-tracker-client-$(TRACKER_API_VERSION).vapi: tracker-client.vapi
-	cp $< $@
-
 BUILT_SOURCES = 					\
 	$(dbus_sources)					\
 	libtracker-client.vala.stamp
 
-CLEANFILES = $(BUILT_SOURCES)				\
-	tracker-client-$(TRACKER_API_VERSION).vapi
+CLEANFILES = 						\
+	$(BUILT_SOURCES)				\
+	$(vapi_DATA)
 
 MAINTAINERCLEANFILES =					\
-	libtracker-client.vala.stamp			\
 	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES:.vala=.c) \
+	libtracker-client.vala.stamp			\
 	tracker-sparql-builder.h
 
 EXTRA_DIST = 						\
 	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES) \
+	tracker-client.vapi				\
 	libtracker-client.vala.stamp
-
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index b1fb428..496426f 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -91,14 +91,6 @@ libtracker_miner_ TRACKER_API_VERSION@_la_SOURCES += 	\
 	tracker-password-provider-keyfile.c
 endif
 
-vapidir=$(datadir)/vala/vapi
-vapi_DATA =                     \
-	tracker-miner-$(TRACKER_API_VERSION).vapi
-
-tracker-miner-web-$(TRACKER_API_VERSION).deps: tracker-miner-web.deps.in
-	$(SED) -e "s|@VERSION[ ]|${TRACKER_API_VERSION}|" $< > $@
-
-
 tracker-marshal.h: tracker-marshal.list
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) $< --prefix=tracker_marshal --header > $@
 
@@ -110,34 +102,50 @@ marshal_sources = 					\
 	tracker-marshal.c				\
 	tracker-marshal.h
 
+# Generate DBus files from XML data.
 dbus_sources = 						\
 	tracker-miner-glue.h				\
 	tracker-miner-web-glue.h			\
 	tracker-miner-client.h
 
+%-glue.h: $(top_srcdir)/data/dbus/%.xml
+	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=_$(subst -,_,$*) $^
+
+%-client.h: $(top_srcdir)/data/dbus/%.xml
+	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=_$(subst -,_,$*) $^
+
+# Vala bindings
+vapidir = $(datadir)/vala/vapi
+vapi_DATA =                     			\
+	tracker-miner-$(TRACKER_API_VERSION).vapi
+
+tracker-miner-$(TRACKER_API_VERSION).vapi: tracker-miner.vapi
+	cp $< $@
+
+# Web details
+tracker-miner-web-$(TRACKER_API_VERSION).deps: tracker-miner-web.deps.in
+	$(SED) -e "s|@VERSION[ ]|${TRACKER_API_VERSION}|" $< > $@
+
 # Custom rule to avoid API duplication. There is also a workaround for bug
 # in dbus-binding-tool where it generates bad code when two files are passed
 # on the command line (though the man page says it supports it)
 # This bug is reported at https://bugs.freedesktop.org/show_bug.cgi?id=25056
 tracker-miner-web-glue.h: $(top_srcdir)/data/dbus/tracker-miner-web.xml $(top_srcdir)/data/dbus/tracker-miner.xml
-	echo '<?xml version="1.0" encoding="UTF-8"?>'        > $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
-	echo '<node name="/">'                              >> $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
-	cat $^ | grep -v -e '<node' -e '<?xml' -e '</node>' >> $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
-	echo '</node>'                                      >> $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
-	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=_tracker_miner_web_dbus $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
+	echo '<?xml version="1.0" encoding="UTF-8"?>'        > tracker-miner-web-full.xml
+	echo '<node name="/">'                              >> tracker-miner-web-full.xml
+	cat $^ | grep -v -e '<node' -e '<?xml' -e '</node>' >> tracker-miner-web-full.xml
+	echo '</node>'                                      >> tracker-miner-web-full.xml
+	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=_tracker_miner_web_dbus $(builddir)/tracker-miner-web-full.xml
 
-%-glue.h: $(top_srcdir)/data/dbus/%.xml
-	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=_$(subst -,_,$*) $^
-
-%-client.h: $(top_srcdir)/data/dbus/%.xml
-	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=_$(subst -,_,$*) $^
+tracker-miner-web-full.xml: tracker-miner-web-glue.h
 
-BUILT_SOURCES = $(dbus_sources) $(marshal_sources)
+BUILT_SOURCES = $(dbus_sources) $(marshal_sources) $(vapi_DATA)
 
 CLEANFILES = $(BUILT_SOURCES)
 
 DISTCLEANFILES = tracker-miner-web-full.xml
 
-EXTRA_DIST = tracker-marshal.list	\
-	$(vapi_DATA)			\
+EXTRA_DIST = 				\
+	tracker-marshal.list		\
+	tracker-miner.vapi		\
 	tracker-miner-web-full.xml
diff --git a/src/libtracker-miner/tracker-miner.vapi b/src/libtracker-miner/tracker-miner.vapi
new file mode 100644
index 0000000..d198810
--- /dev/null
+++ b/src/libtracker-miner/tracker-miner.vapi
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2010, Adrien Bustany (abustany gnome org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+[CCode (cprefix = "Tracker", lower_case_cprefix = "tracker_")]
+namespace Tracker {
+	[CCode (cheader_filename = "libtracker-miner/tracker-miner-object.h")]
+	public class Miner : GLib.Object {
+		public async void commit (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public static GLib.Quark error_quark ();
+		public async void execute_batch_update (string sparql, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async unowned GLib.PtrArray execute_sparql (string sparql, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void execute_update (string sparql, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public void ignore_next_update (string[] urls);
+		public bool is_started ();
+		public int pause (string reason) throws GLib.Error;
+		public virtual void paused ();
+		public bool resume (int cookie) throws GLib.Error;
+		public virtual void resumed ();
+		public void start ();
+		public virtual void started ();
+		public void stop ();
+		public virtual void stopped ();
+		public signal void error (GLib.Error e);
+	}
+	[CCode (ref_function = "tracker_miner_fs_ref", unref_function = "tracker_miner_fs_unref", cheader_filename = "libtracker-miner/tracker-miner-fs.h")]
+	public class MinerFS {
+		public virtual bool check_directory (GLib.File directory);
+		public virtual bool check_directory_contents (GLib.File directory, GLib.List<GLib.File> children);
+		public virtual bool check_file (GLib.File file);
+		public void directory_add (GLib.File file, bool recurse);
+		public bool directory_remove (GLib.File file);
+		public void file_add (GLib.File file);
+		public void file_notify (GLib.File file, GLib.Error error);
+		public unowned string get_parent_urn (GLib.File file);
+		public double get_throttle ();
+		public unowned string get_urn (GLib.File file);
+		public virtual bool monitor_directory (GLib.File directory);
+		public void set_throttle (double throttle);
+		public signal void finished (double elapsed, uint directories_found, uint directories_ignored, uint files_found, uint files_ignored);
+	}
+	[CCode (cheader_filename = "libtracker-miner/tracker-miner-manager.h")]
+	public class MinerManager {
+		[CCode (has_construct_function = false)]
+		public MinerManager ();
+		public unowned GLib.SList get_available ();
+		public unowned string get_description (string miner);
+		public unowned string get_display_name (string miner);
+		public unowned GLib.SList get_running ();
+		public bool get_status (string miner, string status, double progress);
+		public bool ignore_next_update (string miner, string urls);
+		public bool is_active (string miner);
+		public bool is_paused (string miner, string[] applications, string[] reasons);
+		public bool pause (string miner, string reason, uint32 cookie);
+		public bool resume (string miner, uint32 cookie);
+		public virtual void miner_activated (string miner_name);
+		public virtual void miner_deactivated (string miner_name);
+		public virtual void miner_paused (string miner_name);
+		public virtual void miner_resumed (string miner_name);
+		public virtual void miner_progress (string miner_name, string status, double progress);
+	}
+	[CCode (cheader_filename = "libtracker-miner/tracker-miner-web.h")]
+	public class MinerWeb : Tracker.Miner {
+		public virtual void associate (GLib.HashTable association_data) throws Tracker.MinerWebError;
+		public virtual void authenticate () throws Tracker.MinerWebError;
+		public virtual void dissociate () throws Tracker.MinerWebError;
+		public static GLib.Quark error_quark ();
+		public virtual GLib.HashTable get_association_data () throws Tracker.MinerWebError;
+	}
+	[CCode (cheader_filename = "libtracker-miner/tracker-password-provider.h")]
+	public interface PasswordProvider : GLib.Object {
+		public void forget_password (string service) throws GLib.Error;
+		public static unowned Tracker.PasswordProvider @get ();
+		public unowned string get_name ();
+		public string get_password (string service, out string username) throws GLib.Error;
+		public void store_password (string service, string description, string username, string password) throws GLib.Error;
+	}
+	[CCode (cprefix = "TRACKER_MINER_WEB_ERROR_", cheader_filename = "libtracker-miner/tracker-miner-web.h")]
+	public errordomain MinerWebError {
+		WRONG_CREDENTIALS,
+		TOKEN_EXPIRED,
+		NO_CREDENTIALS,
+		KEYRING,
+		SERVICE,
+		TRACKER,
+	}
+	[CCode (cprefix = "TRACKER_PASSWORD_PROVIDER_ERROR_", cheader_filename = "libtracker-miner/tracker-password-provider.h")]
+	public errordomain PasswordProviderError {
+		SERVICE,
+		NOTFOUND,
+	}
+	[CCode (cheader_filename = "libtracker-miner/tracker-miner-object.h")]
+	public const string MINER_WEB_DBUS_INTERFACE;
+	[CCode (cheader_filename = "libtracker-miner/tracker-thumbnailer.h")]
+	public static bool thumbnailer_cleanup (string uri_prefix);
+	[CCode (cheader_filename = "libtracker-miner/tracker-thumbnailer.h")]
+	public static bool thumbnailer_init ();
+	[CCode (cheader_filename = "libtracker-miner/tracker-thumbnailer.h")]
+	public static bool thumbnailer_move_add (string from_uri, string mime_type, string to_uri);
+	[CCode (cheader_filename = "libtracker-miner/tracker-thumbnailer.h")]
+	public static bool thumbnailer_remove_add (string uri, string mime_type);
+	[CCode (cheader_filename = "libtracker-miner/tracker-thumbnailer.h")]
+	public static void thumbnailer_send ();
+	[CCode (cheader_filename = "libtracker-miner/tracker-thumbnailer.h")]
+	public static void thumbnailer_shutdown ();
+}