[telepathy-mission-control/master] McdAccount: Implement Reconnect() in a trivial way, matching what UpdateParameters does

Simon McVittie simon.mcvittie at collabora.co.uk
Fri Apr 17 06:36:33 PDT 2009


This implementation isn't right, but I think McdAccount/McdConnection need
more refactoring before we can write a correct one, and now is not the
time.
---
 src/mcd-account.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 2bd64c3..cc08114 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -1376,7 +1376,16 @@ account_reconnect (McSvcAccount *service,
 
     DEBUG ("%s", mcd_account_get_unique_name (self));
 
-    /* FIXME: stub */
+    /* FIXME: this isn't quite right. If we've just called RequestConnection
+     * (possibly with out of date parameters) but we haven't got a Connection
+     * back from the CM yet, the old parameters will still be used, I think
+     * (I can't quite make out what actually happens). */
+    mcd_connection_close (self->priv->connection);
+    _mcd_account_connection_begin (self);
+
+    /* FIXME: we shouldn't really return from this method until the
+     * reconnection has actually happened, but that would require less tangled
+     * integration between Account and Connection */
     mc_svc_account_return_from_reconnect (context);
 }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list