diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-02 18:15:27 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-03 16:19:24 +0000 |
| commit | 652a324fb6a1030b3525f8395bf5bc05ab50d3d7 (patch) | |
| tree | 083e4ad5dc9411cab9d5fa69501f1f8f129ebf05 /bus/activation.c | |
| parent | c6e024834b8589bc09bcf341bbe97d648e417d16 (diff) | |
| download | dbus-652a324fb6a1030b3525f8395bf5bc05ab50d3d7.tar.gz | |
bus_context_log_and_set_error: add and use
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88810
Reviewed-by: Philip Withnall
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bus/activation.c b/bus/activation.c index 9610c04b..138d69e1 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -1478,11 +1478,8 @@ pending_activation_timed_out (void *data) dbus_error_init (&error); - dbus_set_error (&error, DBUS_ERROR_TIMED_OUT, - "Activation of %s timed out", - pending_activation->service_name); - bus_context_log (pending_activation->activation->context, - DBUS_SYSTEM_LOG_INFO, + bus_context_log_and_set_error (pending_activation->activation->context, + DBUS_SYSTEM_LOG_INFO, &error, DBUS_ERROR_TIMED_OUT, "Failed to activate service '%s': timed out", pending_activation->service_name); |