telepathy-mission-control: GValue was unset in a code path that needed it to stay set

Vivek Dasmohapatra fledermaus at kemper.freedesktop.org
Wed May 2 10:46:02 PDT 2012


Module: telepathy-mission-control
Branch: master
Commit: ef2fb6a8e6decde7d225a17e8e894140f0dbefb2
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=ef2fb6a8e6decde7d225a17e8e894140f0dbefb2

Author: Vivek Dasmohapatra <vivek at collabora.co.uk>
Date:   Fri Apr 13 14:12:53 2012 +0100

GValue was unset in a code path that needed it to stay set

---

 src/mcd-account-manager-sso.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mcd-account-manager-sso.c b/src/mcd-account-manager-sso.c
index 0cf4e41..68a4ba8 100644
--- a/src/mcd-account-manager-sso.c
+++ b/src/mcd-account-manager-sso.c
@@ -870,14 +870,13 @@ _ag_accountid_to_mc_key (McdAccountManagerSso *sso,
       g_value_unset (&value);
       return uid;
     }
-  else
+
+  if (!create)
     {
       g_value_unset (&value);
+      return NULL;
     }
 
-  if (!create)
-    return NULL;
-
   DEBUG ("no " MC_IDENTITY_KEY " found, synthesising one:");
 
   src = _ag_account_global_value (account, AG_ACCOUNT_KEY, &value);



More information about the telepathy-commits mailing list