diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-21 13:21:29 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-21 11:34:31 +0100 |
commit | 423ab7cdd033f10350c580256c9a06e70590de8b (patch) | |
tree | 358e0436e767b812fb0423ff1490621359ee040c /bus | |
parent | c38e9823da1980d4323006f86ec5968be7d64e76 (diff) | |
download | dbus-423ab7cdd033f10350c580256c9a06e70590de8b.tar.gz |
update_desktop_file_entry: initialize return value properly, and actually return it
Since 1.4.4 (commit 75cfd97f) this function always returned FALSE. As far
as I can see this was actually harmless, because both of its callers
ignore any error that is not NoMemory (and treat it the same as success).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Diffstat (limited to 'bus')
-rw-r--r-- | bus/activation.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/activation.c b/bus/activation.c index 8c9f5598..acb2aa89 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -268,6 +268,7 @@ update_desktop_file_entry (BusActivation *activation, _DBUS_ASSERT_ERROR_IS_CLEAR (error); + retval = FALSE; name = NULL; exec = NULL; user = NULL; @@ -478,7 +479,7 @@ out: if (entry) bus_activation_entry_unref (entry); - return FALSE; + return retval; } static dbus_bool_t |