From 4a1641c4fbb279b36080fe4ecd7101876aed8aba Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 19 Oct 2012 16:17:35 +0200 Subject: [PATCH] connection: Don't reset the capabilities in UpdateCapabilities This ensures that a running Gabble process will always create Call1 channels once it has seen such a client in its lifetime. Fixes: https://bugs.freedesktop.org/56181 --- src/connection.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/connection.c b/src/connection.c index 5ea0d1a..e53b3de 100644 --- a/src/connection.c +++ b/src/connection.c @@ -3368,25 +3368,12 @@ gabble_connection_update_capabilities ( GabbleConnection *self = GABBLE_CONNECTION (iface); TpBaseConnection *base = (TpBaseConnection *) self; GabbleCapabilitySet *old_caps = NULL; - TpChannelManagerIter iter; - TpChannelManager *manager; guint i; /* Now that someone has told us our *actual* capabilities, we can stop * advertising spurious caps in initial presence */ gabble_capability_set_clear (self->priv->bonus_caps); - tp_base_connection_channel_manager_iter_init (&iter, base); - - while (tp_base_connection_channel_manager_iter_next (&iter, &manager)) - { - if (GABBLE_IS_CAPS_CHANNEL_MANAGER (manager)) - { - gabble_caps_channel_manager_reset_capabilities ( - GABBLE_CAPS_CHANNEL_MANAGER (manager)); - } - } - DEBUG ("enter"); for (i = 0; i < clients->len; i++) @@ -3397,6 +3384,8 @@ gabble_connection_update_capabilities ( const gchar * const * cap_tokens = g_value_get_boxed (va->values + 2); GabbleCapabilitySet *cap_set; GPtrArray *data_forms; + TpChannelManagerIter iter; + TpChannelManager *manager; g_hash_table_remove (self->priv->client_caps, client_name); g_hash_table_remove (self->priv->client_data_forms, client_name); -- 1.7.12.1