[Pkg-telepathy-commits] [telepathy-glib-1] 196/212: tp_base_connection_change_status: update RequestableChannelClasses before StatusChanged

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib-1.

commit 5ab4d154f1e83d86e1f2f8e732f4038e9a321512
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Apr 17 14:20:18 2014 +0100

    tp_base_connection_change_status: update RequestableChannelClasses before StatusChanged
    
    Reviewed-by: Xavier Claessens <xavier.claessens at collabora.com>
    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77189
---
 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 935cef7..99ca29c 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git