From: Simon McVittie Date: Thu, 21 Jul 2011 12:12:15 +0000 (+0100) Subject: update_desktop_file_entry: if the service name already existed, set error X-Git-Tag: dbus-1.4.16~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c38e9823da1980d4323006f86ec5968be7d64e76;p=thirdparty%2Fdbus.git update_desktop_file_entry: if the service name already existed, set error If we're going to return FALSE for this (which has apparently always been the case), then we should set an error properly. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230 Reviewed-by: Will Thompson --- diff --git a/bus/activation.c b/bus/activation.c index c1f0e949f..8c9f55983 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -427,8 +427,11 @@ update_desktop_file_entry (BusActivation *activation, if (_dbus_hash_table_lookup_string (activation->entries, name)) { - _dbus_verbose ("The new service name \"%s\" of service file \"%s\" already in cache, ignoring\n", + _dbus_verbose ("The new service name \"%s\" of service file \"%s\" is already in cache, ignoring\n", name, _dbus_string_get_const_data (&file_path)); + dbus_set_error (error, DBUS_ERROR_FAILED, + "The new service name \"%s\" of service file \"%s\" is already in cache, ignoring\n", + name, _dbus_string_get_const_data (&file_path)); goto out; }