Don't announce new tubes channel until the muc is ready

When the muc becomes ready it will announce both the text channel and tubes
channels if applicable, so don't directly announce muc tubes before the muc is
ready. Closes: #28279

1 files changed, 7 insertions, 1 deletions

diff --git a/src/muc-factory.c b/src/muc-factory.c
index 00e1b0da7..c0c652f87 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -424,9 +424,15 @@ muc_channel_new_tube (GabbleMucChannel *channel,
     gpointer user_data)
 {
   GabbleMucFactory *fac = GABBLE_MUC_FACTORY (user_data);
+  GabbleMucFactoryPrivate *priv = fac->priv;
 
-  tp_channel_manager_emit_new_channel (fac,
+  /* If the muc channel is ready announce the tubes channel right away
+   * otherwise wait for the text channel to be ready */
+  if (_gabble_muc_channel_is_ready (channel))
+    tp_channel_manager_emit_new_channel (fac,
       TP_EXPORTABLE_CHANNEL (tube), NULL);
+  else
+    g_hash_table_insert (priv->text_needed_for_tubes, channel, tube);
 
   g_signal_connect (tube, "closed",
     G_CALLBACK (muc_sub_channel_closed_cb), fac);