From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 21 Jul 2011 12:21:29 +0000 (+0100)
Subject: update_desktop_file_entry: initialize return value properly, and actually return it
X-Git-Tag: dbus-1.4.16~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=423ab7cdd033f10350c580256c9a06e70590de8b;p=platform%2Fupstream%2Fdbus.git

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>
---

diff --git a/bus/activation.c b/bus/activation.c
index 8c9f559..acb2aa8 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