[telepathy-mission-control/master] mcd_account_request_presence_int: don't try to connect invalid accounts

Simon McVittie simon.mcvittie at collabora.co.uk
Thu Jun 25 06:26:32 PDT 2009


---
 src/mcd-account.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 633abc6..0aa8706 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -644,9 +644,19 @@ mcd_account_request_presence_int (McdAccount *account,
 	changed = TRUE;
     }
 
-    if (type >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE && !priv->enabled)
+    if (type >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE)
     {
-        return changed;
+        if (!priv->enabled)
+        {
+            DEBUG ("%s not Enabled", priv->unique_name);
+            return changed;
+        }
+
+        if (!priv->valid)
+        {
+            DEBUG ("%s not Valid", priv->unique_name);
+            return changed;
+        }
     }
 
     if (priv->connection == NULL)
-- 
1.5.6.5




More information about the telepathy-commits mailing list