From: Mike Gorse <mgorse@novell.com>
Date: Mon, 21 Mar 2011 19:14:32 +0000 (-0700)
Subject: Use new dbus errors if they are available
X-Git-Tag: AT_SPI2_ATK_2_12_0~247
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccc0eca4840cfeba27754b0cd2b576d9698068a4;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

Use new dbus errors if they are available

If a new version of libdbus is available, use DBUS_ERROR_UNKNOWN_OBJECT,
DBUS_ERROR_UNKNOWN_PROPERTY, and DBUS_ERROR_PROPERTY_READ_ONLY when
appropriate.
---

diff --git a/droute/droute.c b/droute/droute.c
index b58402c..20c262f 100644
--- a/droute/droute.c
+++ b/droute/droute.c
@@ -326,7 +326,11 @@ impl_prop_GetSet (DBusMessage *message,
 
     prop_funcs = (PropertyPair *) g_hash_table_lookup (path->properties, &pair);
     if (!prop_funcs)
+#ifdef DBUS_ERROR_UNKNOWN_PROPERTY
+        return dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable");
+#else
         return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+#endif
 
     datum = path_get_datum (path, pathstr);
     if (!datum)
@@ -361,6 +365,12 @@ impl_prop_GetSet (DBusMessage *message,
 
         reply = dbus_message_new_method_return (message);
       }
+#ifdef DBUS_ERROR_PROPERTY_READ_ONLY
+    else if (!get)
+      {
+        reply = dbus_message_new_error (message, DBUS_ERROR_PROPERTY_READ_ONLY, "Property is read-only");
+      }
+#endif
     else
       {
         reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Getter or setter unavailable");
@@ -596,9 +606,15 @@ droute_object_does_not_exist_error (DBusMessage *message)
             dbus_message_get_signature (message),
             dbus_message_get_interface (message),
             dbus_message_get_path (message));
+#ifdef DBUS_ERROR_UNKNOWN_OBJECT
+    reply = dbus_message_new_error (message,
+                                    DBUS_ERROR_UNKNOWN_OBJECT,
+                                    errmsg);
+#else
     reply = dbus_message_new_error (message,
                                     DBUS_ERROR_FAILED,
                                     errmsg);
+#endif
     g_free (errmsg);
     return reply;
 }