From f79e2c87ab3124ba2c0f5327870b6d4040075451 Mon Sep 17 00:00:00 2001 From: Eitan Isaacson Date: Wed, 17 Feb 2010 11:59:34 -0800 Subject: [PATCH] Move _mcd_dispatcher_add_connection to an earlier stage. https://bugs.freedesktop.org/show_bug.cgi?id=26583 --- src/mcd-connection.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mcd-connection.c b/src/mcd-connection.c index 72d2bd3..a70475a 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -1534,8 +1534,6 @@ on_connection_ready (TpConnection *tp_conn, const GError *error, if (priv->has_alias_if) _mcd_connection_setup_alias (connection); - _mcd_dispatcher_add_connection (priv->dispatcher, connection); - g_signal_emit (connection, signals[READY], 0); } @@ -1588,6 +1586,8 @@ mcd_connection_done_task_before_connect (McdConnection *self) DEBUG ("TpConnection went away, not doing anything"); } + _mcd_dispatcher_add_connection (self->priv->dispatcher, self); + DEBUG ("%s: Calling Connect()", tp_proxy_get_object_path (self->priv->tp_conn)); tp_cli_connection_call_connect (self->priv->tp_conn, -1, connect_cb, @@ -1707,6 +1707,10 @@ mcd_connection_early_get_interfaces_cb (TpConnection *tp_conn, * we can't usefully pre-load capabilities - we'll be told * the real capabilities as soon as it has worked them out */ } + else if (q == TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS) + { + tp_proxy_add_interface_by_id ((TpProxy *) tp_conn, q); + } } } -- 1.7.0