Simplify empathy_contact_get_account

[empathy.git] / libempathy / empathy-contact.c

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index a44abfe6874c2316720871b78e013cd49c0f0711..37910928501bbeac1b0e0653249dd98369395f7a 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -527,10 +527,7 @@ empathy_contact_get_account (EmpathyContact *contact)
 
   priv = GET_PRIV (contact);
 
-  if (priv->account != NULL)
-    return priv->account;
-
-  if (priv->tp_contact != NULL)
+  if (priv->account == NULL && priv->tp_contact != NULL)
     {
       EmpathyAccountManager *manager;
       TpConnection *connection;
@@ -539,12 +536,11 @@ empathy_contact_get_account (EmpathyContact *contact)
       manager = empathy_account_manager_dup_singleton ();
       connection = tp_contact_get_connection (priv->tp_contact);
       priv->account = empathy_account_manager_get_account (manager, connection);
+      g_object_ref (priv->account);
       g_object_unref (manager);
-
-      return g_object_ref (priv->account);
     }
 
-  return NULL;
+  return priv->account;
 }
 
 TpConnection *