diff options
author | Mike Gorse <mgorse@suse.com> | 2022-04-12 11:38:58 -0500 |
---|---|---|
committer | Mike Gorse <mgorse@suse.com> | 2022-04-12 11:38:58 -0500 |
commit | 8b8e4d925d8fdf7a9bbf99c1d2cae10b2298668d (patch) | |
tree | 4ffe9fe75d9d12bf1ccd08983731e8c68bf4b882 /droute/droute.c | |
parent | 36e473787006347a8954ca7bc958d1eb39aa57f6 (diff) | |
download | at-spi2-core-8b8e4d925d8fdf7a9bbf99c1d2cae10b2298668d.tar.gz |
Remove some unneeded conditionals
DBUS_ERROR_UNKNOWN_OBJECT, etc. have been defined for more than a decade now.
No need to check for them.
Diffstat (limited to 'droute/droute.c')
-rw-r--r-- | droute/droute.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/droute/droute.c b/droute/droute.c index bc03d741..2c698756 100644 --- a/droute/droute.c +++ b/droute/droute.c @@ -348,11 +348,7 @@ impl_prop_GetSet (DBusMessage *message, if (!prop_funcs) { DBusMessage *ret; -#ifdef DBUS_ERROR_UNKNOWN_PROPERTY ret = dbus_message_new_error (message, DBUS_ERROR_UNKNOWN_PROPERTY, "Property unavailable"); -#else - ret = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable"); -#endif dbus_error_free (&error); return ret; } @@ -390,12 +386,10 @@ 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"); @@ -635,15 +629,9 @@ 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; } |