From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 10 Oct 2007 10:38:34 +0000 (+0100)
Subject: Add error o.fd.D.Error.ObjectPathInUse (DBUS_ERROR_OBJECT_PATH_IN_USE)
X-Git-Tag: dbus-1.1.3~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7fbcb5e025b3c718dd1fd332b8759ae26c0d8dc;p=thirdparty%2Fdbus.git

Add error o.fd.D.Error.ObjectPathInUse (DBUS_ERROR_OBJECT_PATH_IN_USE)
---

diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c
index 7c1d68e53..d0a80b02a 100644
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -97,6 +97,8 @@ message_from_error (const char *error)
     return "Did not get a reply message.";
   else if (strcmp (error, DBUS_ERROR_FILE_NOT_FOUND) == 0)
     return "File doesn't exist.";
+  else if (strcmp (error, DBUS_ERROR_OBJECT_PATH_IN_USE) == 0)
+    return "Object path already in use";
   else
     return error;
 }
diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
index 240f95269..58677dcfc 100644
--- a/dbus/dbus-protocol.h
+++ b/dbus/dbus-protocol.h
@@ -411,6 +411,8 @@ extern "C" {
 #define DBUS_ERROR_INVALID_FILE_CONTENT       "org.freedesktop.DBus.Error.InvalidFileContent"
 /** Asked for SELinux security context and it wasn't available. */
 #define DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN    "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown"
+/** There's already an object with the requested object path. */
+#define DBUS_ERROR_OBJECT_PATH_IN_USE         "org.freedesktop.DBus.Error.ObjectPathInUse"
 
 /* XML introspection format */