etrunko pushed a commit to branch master. http://git.enlightenment.org/legacy/eldbus.git/commit/?id=d301daf536becedc8b869b2d918c6d0db73f5bb4
commit d301daf536becedc8b869b2d918c6d0db73f5bb4 Author: José Roberto de Souza <[email protected]> Date: Fri Aug 30 10:52:04 2013 -0300 eldbus: Add timeout message error as a macro --- src/lib/Eldbus.h | 1 + src/lib/eldbus_pending.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/Eldbus.h b/src/lib/Eldbus.h index e49061d..fe05f2e 100644 --- a/src/lib/Eldbus.h +++ b/src/lib/Eldbus.h @@ -126,6 +126,7 @@ extern "C" { #define ELDBUS_FDO_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" #define ELDBUS_FDO_INTEFACE_PEER "org.freedesktop.DBus.Peer" #define ELDBUS_ERROR_PENDING_CANCELED "org.enlightenment.DBus.Canceled" +#define ELDBUS_ERROR_PENDING_TIMEOUT "org.enlightenment.DBus.Timeout" typedef struct _Eldbus_Version { diff --git a/src/lib/eldbus_pending.c b/src/lib/eldbus_pending.c index 4174ac1..bf561bb 100644 --- a/src/lib/eldbus_pending.c +++ b/src/lib/eldbus_pending.c @@ -51,8 +51,8 @@ cb_pending(DBusPendingCall *dbus_pending, void *user_data) INF("timeout to pending %p", pending); dbus_pending_call_cancel(dbus_pending); msg = eldbus_message_error_new(pending->msg_sent, - "org.enlightenment.DBus.Timeout", - "This call was not completed."); + ELDBUS_ERROR_PENDING_TIMEOUT, + "This call was not completed in time."); eldbus_pending_dispatch(pending, msg); return; } @@ -218,8 +218,8 @@ eldbus_pending_cancel(Eldbus_Pending *pending) dbus_pending_call_cancel(pending->dbus_pending); error_message = eldbus_message_error_new(pending->msg_sent, - ELDBUS_ERROR_PENDING_CANCELED, - "Canceled by user."); + ELDBUS_ERROR_PENDING_CANCELED, + "Canceled by user."); eldbus_pending_dispatch(pending, error_message); } --
