[Telepathy-commits] [telepathy-gabble/master] when we're invited, mark the channel as ready in the constructor (emitting a signal is pointless before the constructor has returned)

[Robert McQueen]

20080727000649-418b8-9102892e630d39bcd79d2d1d16881e242d465774.gz
---
 src/muc-channel.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/muc-channel.c b/src/muc-channel.c
index a50d32b..0acdec8 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -389,6 +389,9 @@ gabble_muc_channel_constructor (GType type, guint n_props,
        * in keeping it */
       g_free (priv->invitation_message);
       priv->invitation_message = NULL;
+
+      /* mark channel ready so NewChannel is emitted immediately */
+      priv->ready = TRUE;
     }
 
   tp_handle_unref (contact_handles, self_handle);
@@ -2265,10 +2268,6 @@ _gabble_muc_channel_handle_invited (GabbleMucChannel *chan,
 
   tp_intset_destroy (set_members);
   tp_intset_destroy (set_pending);
-
-  /* emit READY signal so NewChannel is emitted */
-  g_signal_emit (chan, signals[READY], 0);
-  priv->ready = TRUE;
 }
 
 /**
-- 
1.5.6.3