diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-21 11:39:32 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-21 11:39:32 +0100 |
| commit | bf3d8259ac89ee4fe86b3f9e6df71f6e71e07fd2 (patch) | |
| tree | d80925fcf3feaa14b9e7eed571d0ce9e3cf53efc /bus | |
| parent | c1989c1a4f013085fe5eceb6bffa89d1e1b66bf5 (diff) | |
| parent | bdfec550544d353e60228b0553534467cbb36a06 (diff) | |
| download | dbus-bf3d8259ac89ee4fe86b3f9e6df71f6e71e07fd2.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/activation.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bus/activation.c b/bus/activation.c index 6101173f..97f9606b 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -257,6 +257,7 @@ update_desktop_file_entry (BusActivation *activation, _DBUS_ASSERT_ERROR_IS_CLEAR (error); + retval = FALSE; name = NULL; exec = NULL; user = NULL; @@ -416,8 +417,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; } @@ -446,8 +450,7 @@ update_desktop_file_entry (BusActivation *activation, * the entries hash table */ _dbus_hash_table_remove_string (entry->s_dir->entries, entry->filename); - bus_activation_entry_unref (entry); - return FALSE; + goto out; } } @@ -465,7 +468,7 @@ out: if (entry) bus_activation_entry_unref (entry); - return FALSE; + return retval; } static dbus_bool_t |