[telepathy-mission-control/master] Don't always overwrite the automatic presence

[Alberto Mardegan]

This avoids rewriting the automatic presence status that we just set few lines
above (and also avoids leaking it).
---
 src/mcd-account.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 77f39af..9f860e4 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -1925,11 +1925,14 @@ mcd_account_setup (McdAccount *account)
         priv->auto_presence_type = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
         priv->auto_presence_status = g_strdup ("available");
     }
+    else
+    {
+        priv->auto_presence_status =
+            g_key_file_get_string (priv->keyfile, priv->unique_name,
+                                   MC_ACCOUNTS_KEY_AUTO_PRESENCE_STATUS,
+                                   NULL);
+    }
 
-    priv->auto_presence_status =
-	g_key_file_get_string (priv->keyfile, priv->unique_name,
-			       MC_ACCOUNTS_KEY_AUTO_PRESENCE_STATUS,
-			       NULL);
     priv->auto_presence_message =
 	g_key_file_get_string (priv->keyfile, priv->unique_name,
 			       MC_ACCOUNTS_KEY_AUTO_PRESENCE_MESSAGE,
-- 
1.5.6.5