From 49fe3c0ac98e28ed62c937a0588605748e088f53 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 17 Apr 2014 14:20:18 +0100 Subject: tp_base_connection_change_status: update RequestableChannelClasses before StatusChanged --- telepathy-glib/base-connection.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c index 935cef794..99ca29c8b 100644 --- a/telepathy-glib/base-connection.c +++ b/telepathy-glib/base-connection.c @@ -1799,6 +1799,11 @@ tp_base_connection_change_status (TpBaseConnection *self, if (self->priv->disconnect_requests == NULL) self->priv->disconnect_requests = g_ptr_array_sized_new (0); } + else if (status == TP_CONNECTION_STATUS_CONNECTED) + { + /* RCC property is immutable after CONNECTED, do a last update now */ + update_rcc_property (self); + } DEBUG("emitting status-changed to %u, for reason %u", status, reason); _tp_gdbus_connection_set_status (self->priv->connection_skeleton, status); @@ -1825,9 +1830,6 @@ tp_base_connection_change_status (TpBaseConnection *self, g_assert (tp_handle_is_valid (priv->handles[TP_ENTITY_TYPE_CONTACT], priv->self_handle, NULL)); - /* RCC property is immutable after CONNECTED, do a last update now */ - update_rcc_property (self); - if (klass->connected) (klass->connected) (self); break; -- cgit v1.2.3