[tracker/libtracker-miner: 259/263] Fix build after updating with master.

[Carlos Garnacho <carlosg src gnome org>]

commit d5fbd7bcd57b25e0646942336d7b50fe9d2d8fa3
Author: Carlos Garnacho <carlos lanedo com>
Date:   Thu Sep 3 17:27:01 2009 +0200

    Fix build after updating with master.

 src/tracker-miner-fs/tracker-indexer.c            |    1 -
 src/tracker-miner-fs/tracker-miner-applications.c |    1 +
 src/tracker-miner-fs/tracker-miner-files.c        |   10 +++---
 src/tracker-miner-fs/tracker-miner-main.c         |    4 --
 src/tracker-utils/tracker-status.c                |   36 ++++++++++----------
 5 files changed, 24 insertions(+), 28 deletions(-)
---
diff --git a/src/tracker-miner-fs/tracker-indexer.c b/src/tracker-miner-fs/tracker-indexer.c
index 7d265e4..bf951fd 100644
--- a/src/tracker-miner-fs/tracker-indexer.c
+++ b/src/tracker-miner-fs/tracker-indexer.c
@@ -74,7 +74,6 @@
 #include "tracker-indexer-module.h"
 #include "tracker-marshal.h"
 #include "tracker-removable-device.h"
-#include "tracker-processor.h"
 #include "tracker-status.h"
 #include "tracker-thumbnailer.h"
 #include "tracker-utils.h"
diff --git a/src/tracker-miner-fs/tracker-miner-applications.c b/src/tracker-miner-fs/tracker-miner-applications.c
index 94b9413..db606ca 100644
--- a/src/tracker-miner-fs/tracker-miner-applications.c
+++ b/src/tracker-miner-fs/tracker-miner-applications.c
@@ -225,6 +225,7 @@ miner_applications_process_file_cb (gpointer user_data)
 	GStrv cats = NULL;
 	gsize cats_len;
 	GError *error = NULL;
+	gboolean is_software = TRUE;
 
 	sparql = data->sparql;
 	key_file = get_desktop_key_file (data->file, &type, &error);
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 73b8050..d1ddad7 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -879,11 +879,11 @@ get_embedded_metadata (ProcessFileData *data,
 		       const gchar     *uri,
 		       const gchar     *mime_type)
 {
-	data->call = org_freedesktop_Tracker_Extract_get_metadata_async (data->miner->private->extractor_proxy,
-									 uri,
-									 mime_type,
-									 get_embedded_metadata_cb,
-									 data);
+	data->call = org_freedesktop_Tracker1_Extract_get_metadata_async (data->miner->private->extractor_proxy,
+									  uri,
+									  mime_type,
+									  get_embedded_metadata_cb,
+									  data);
 	g_signal_connect (data->cancellable, "cancelled",
 			  G_CALLBACK (get_embedded_metadata_cancel), data);
 }
diff --git a/src/tracker-miner-fs/tracker-miner-main.c b/src/tracker-miner-fs/tracker-miner-main.c
index 1a1b8cd..56520ff 100644
--- a/src/tracker-miner-fs/tracker-miner-main.c
+++ b/src/tracker-miner-fs/tracker-miner-main.c
@@ -39,15 +39,11 @@
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-thumbnailer.h>
 #include <libtracker-common/tracker-storage.h>
 
 #include <libtracker-db/tracker-db-manager.h>
 #include <libtracker-db/tracker-db-dbus.h>
 
-#include <libtracker-data/tracker-turtle.h>
-
-#include "tracker-albumart.h"
 #include "tracker-dbus.h"
 #include "tracker-config.h"
 #include "tracker-indexer.h"
diff --git a/src/tracker-utils/tracker-status.c b/src/tracker-utils/tracker-status.c
index 7007697..a92cf42 100644
--- a/src/tracker-utils/tracker-status.c
+++ b/src/tracker-utils/tracker-status.c
@@ -236,11 +236,11 @@ miner_pause (const gchar *miner,
 	g_print ("%s\n", str);
 	g_free (str);
 	
-	if (!org_freedesktop_Tracker_Miner_pause (proxy, 
-						  g_get_application_name (),
-						  reason,
-						  &cookie, 
-						  &error)) {
+	if (!org_freedesktop_Tracker1_Miner_pause (proxy, 
+						   g_get_application_name (),
+						   reason,
+						   &cookie, 
+						   &error)) {
 		str = g_strdup_printf (_("Could not pause miner: %s"),
 				       name);
 		g_printerr ("  %s. %s\n", 
@@ -285,9 +285,9 @@ miner_resume (const gchar *miner,
 	g_print ("%s\n", str);
 	g_free (str);
 	
-	if (!org_freedesktop_Tracker_Miner_resume (proxy, 
-						   cookie, 
-						   &error)) {
+	if (!org_freedesktop_Tracker1_Miner_resume (proxy, 
+						    cookie, 
+						    &error)) {
 		str = g_strdup_printf (_("Could not resume miner: %s"),
 				       name);
 		g_printerr ("  %s. %s\n", 
@@ -339,9 +339,9 @@ miner_get_details (const gchar  *miner,
 		return FALSE;
 	}
 	
-	if (status && !org_freedesktop_Tracker_Miner_get_status (proxy, 
-								 status,
-								 &error)) {
+	if (status && !org_freedesktop_Tracker1_Miner_get_status (proxy, 
+								  status,
+								  &error)) {
 		gchar *str;
 
 		str = g_strdup_printf (_("Could not get status from miner: %s"),
@@ -357,9 +357,9 @@ miner_get_details (const gchar  *miner,
 		return FALSE;
 	}
 
-	if (progress && !org_freedesktop_Tracker_Miner_get_progress (proxy, 
-								     progress,
-								     &error)) {
+	if (progress && !org_freedesktop_Tracker1_Miner_get_progress (proxy, 
+								      progress,
+								      &error)) {
 		gchar *str;
 
 		str = g_strdup_printf (_("Could not get progress from miner: %s"),
@@ -376,10 +376,10 @@ miner_get_details (const gchar  *miner,
 	}
 
 	if ((pause_applications && pause_reasons) &&
-	    !org_freedesktop_Tracker_Miner_get_pause_details (proxy, 
-							      pause_applications,
-							      pause_reasons,
-							      &error)) {
+	    !org_freedesktop_Tracker1_Miner_get_pause_details (proxy, 
+							       pause_applications,
+							       pause_reasons,
+							       &error)) {
 		gchar *str;
 
 		str = g_strdup_printf (_("Could not get paused details from miner: %s"),