[tracker/dbus-fd-experiment: 40/49] tracker-store: Use DBUS_ERROR_UNKNOWN_METHOD not our own version

[Martyn James Russell <mr src gnome org>]

commit a308e6c261185a6b2c9254d70f18b20d74c771d5
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Jun 21 15:17:26 2010 +0100

    tracker-store: Use DBUS_ERROR_UNKNOWN_METHOD not our own version
    
    - We redefined this as another symbol
    - We shouldn't be using DBUS_ namespace for any of our symbols

 src/tracker-store/tracker-steroids.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/tracker-store/tracker-steroids.c b/src/tracker-store/tracker-steroids.c
index 333fa98..8fecdef 100644
--- a/src/tracker-store/tracker-steroids.c
+++ b/src/tracker-store/tracker-steroids.c
@@ -20,6 +20,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <unistd.h>
+
+#include <dbus/dbus.h>
+
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixinputstream.h>
 
@@ -27,8 +30,7 @@
 #include "tracker-steroids.h"
 #include "tracker-store.h"
 
-#define DBUS_ERROR_UNKNOWN_METHOD_NAME "org.freedesktop.DBus.Error.UnknownMethod"
-#define DBUS_ERROR_UNKNOWN_METHOD_MESSAGE "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist"
+#define UNKNOWN_METHOD_MESSAGE "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist"
 
 /**
  * /!\ IMPORTANT WARNING /!\
@@ -366,8 +368,8 @@ tracker_steroids_query (TrackerSteroids *steroids,
 
 	if (g_strcmp0 (dbus_message_get_signature (message), DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_UNIX_FD_AS_STRING)) {
 		reply = dbus_message_new_error_printf (message,
-		                                       DBUS_ERROR_UNKNOWN_METHOD_NAME,
-		                                       DBUS_ERROR_UNKNOWN_METHOD_MESSAGE,
+		                                       DBUS_ERROR_UNKNOWN_METHOD,   
+		                                       UNKNOWN_METHOD_MESSAGE,
 		                                       "Query",
 		                                       dbus_message_get_signature (message),
 		                                       dbus_message_get_interface (message));
@@ -433,8 +435,8 @@ tracker_steroids_update (TrackerSteroids *steroids,
 
 	if (g_strcmp0 (dbus_message_get_signature (message), DBUS_TYPE_UNIX_FD_AS_STRING)) {
 		reply = dbus_message_new_error_printf (message,
-		                                       DBUS_ERROR_UNKNOWN_METHOD_NAME,
-		                                       DBUS_ERROR_UNKNOWN_METHOD_MESSAGE,
+		                                       DBUS_ERROR_UNKNOWN_METHOD,
+		                                       UNKNOWN_METHOD_MESSAGE,
 		                                       "Update",
 		                                       dbus_message_get_signature (message),
 		                                       dbus_message_get_interface (message));