[telepathy-mission-control/master] McdMaster: call _mcd_account_maybe_autoconnect rather than reimplementing it

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


---
 src/mcd-master.c |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/src/mcd-master.c b/src/mcd-master.c
index e81b025..9762029 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -233,21 +233,7 @@ mcd_master_connect_automatic_accounts (McdMaster *master)
     g_hash_table_iter_init (&iter, accounts);
     while (g_hash_table_iter_next (&iter, &ht_key, &ht_value))
     {
-        McdAccount *account = MCD_ACCOUNT (ht_value);
-
-        if (mcd_account_is_valid (account) &&
-            mcd_account_is_enabled (account) &&
-            mcd_account_get_connect_automatically (account) &&
-            mcd_account_get_connection_status (account) ==
-            TP_CONNECTION_STATUS_DISCONNECTED)
-        {
-            /* if the account conditions are satisfied, connect */
-            if (_mcd_master_account_conditions_satisfied (master, account))
-            {
-                DEBUG ("conditions matched");
-                _mcd_account_connect_with_auto_presence (account);
-            }
-        }
+        _mcd_account_maybe_autoconnect (ht_value);
     }
 }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list