[telepathy-mission-control/master] Implement _mcd_account_request_connection by simply asking for the AutomaticPresence
Simon McVittie
simon.mcvittie at collabora.co.uk
Thu Jun 25 10:53:52 PDT 2009
Now that we enforce that AutomaticPresence is an online status, this
should work.
---
src/mcd-account.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/mcd-account.c b/src/mcd-account.c
index e0d2ed4..5e4d790 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -2813,14 +2813,10 @@ _mcd_account_request_connection (McdAccount *account)
{
McdAccountPrivate *priv = account->priv;
- if (!priv->connection)
- _mcd_account_connection_begin (account);
-
- if (priv->auto_presence_type >= TP_CONNECTION_PRESENCE_TYPE_AVAILABLE)
- mcd_account_request_presence_int (account,
- priv->auto_presence_type,
- priv->auto_presence_status,
- priv->auto_presence_message);
+ mcd_account_request_presence (account,
+ priv->auto_presence_type,
+ priv->auto_presence_status,
+ priv->auto_presence_message);
}
/*
--
1.5.6.5
More information about the telepathy-commits
mailing list