[tracker/gdbus-porting-rebased: 56/65] libtracker-miner, tracker-extract: Don't use old dbus-glib errors

[Philip Van Hoof <pvanhoof src gnome org>]

commit c1e08b536b367a0acc5e4f53080d0ece35e8512d
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jan 7 15:44:32 2011 +0000

    libtracker-miner, tracker-extract: Don't use old dbus-glib errors

 src/libtracker-miner/tracker-miner-fs.c      |    6 +++---
 src/libtracker-miner/tracker-miner-manager.c |    2 +-
 src/tracker-extract/tracker-albumart.c       |    4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index c15599f..f4c25df 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -1619,9 +1619,9 @@ item_add_or_update_cb (TrackerMinerFS        *fs,
 		 * the others.
 		 */
 		if (task != first_item_task &&
-		    (error->code == DBUS_GERROR_NO_REPLY ||
-		     error->code == DBUS_GERROR_TIMEOUT ||
-		     error->code == DBUS_GERROR_TIMED_OUT)) {
+		    (error->code == G_DBUS_ERROR_NO_REPLY ||
+		     error->code == G_DBUS_ERROR_TIMEOUT ||
+		     error->code == G_DBUS_ERROR_TIMED_OUT)) {
 			g_debug ("  Got DBus timeout error on '%s', but it could not be caused by it. Retrying file.", uri);
 
 			/* Reset the TrackerSparqlBuilder */
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 987fc2c..14c0597 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -858,7 +858,7 @@ tracker_miner_manager_get_status (TrackerMinerManager  *manager,
 		/* We handle this error as a special case, some
 		 * plugins don't have .service files.
 		 */
-		if (error->code != DBUS_GERROR_SERVICE_UNKNOWN) {
+		if (error->code != G_DBUS_ERROR_SERVICE_UNKNOWN) {
 			g_critical ("Could not get miner progress for '%s': %s", miner,
 			            error->message);
 		}
diff --git a/src/tracker-extract/tracker-albumart.c b/src/tracker-extract/tracker-albumart.c
index 959f67b..e9fabd2 100644
--- a/src/tracker-extract/tracker-albumart.c
+++ b/src/tracker-extract/tracker-albumart.c
@@ -31,8 +31,6 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
-#include <dbus/dbus-glib-bindings.h>
-
 #include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-albumart.h"
@@ -663,7 +661,7 @@ albumart_queue_cb (GObject      *source_object,
 	v = g_dbus_connection_call_finish ((GDBusConnection *) source_object, res, &error);
 
 	if (error) {
-		if (error->code == DBUS_GERROR_SERVICE_UNKNOWN) {
+		if (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN) {
 			disable_requests = TRUE;
 		} else {
 			g_warning ("%s", error->message);