[telepathy-mission-control/master] McdDispatcher: declare it to be an error to call _mcd_dispatcher_recover_channel before dispatching has started

Simon McVittie simon.mcvittie at collabora.co.uk
Fri May 22 08:12:08 PDT 2009


McdConnection doesn't, so this assertion should never be hit.

This means that if we promote the download of HandledChannels to happen
before dispatching starts, we'll no longer need to wait for it.
---
 src/mcd-dispatcher.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index b90b0f1..51f8063 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -3381,6 +3381,7 @@ _mcd_dispatcher_recover_channel (McdDispatcher *dispatcher,
      */
     g_return_if_fail (MCD_IS_DISPATCHER (dispatcher));
     priv = dispatcher->priv;
+    g_return_if_fail (priv->startup_completed);
 
     cr = g_slice_new0 (McdChannelRecover);
     cr->channel = g_object_ref (channel);
-- 
1.5.6.5




More information about the telepathy-commits mailing list