Merge branch 'telepathy-glib-0.14'

1 files changed, 4 insertions, 1 deletions

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 8e5e0762..ad05abbf 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -2875,7 +2875,6 @@ tp_base_connection_change_status (TpBaseConnection *self,
     }
 
   prev_status = self->status;
-  self->status = status;
 
   /* make appropriate assertions about our state */
   switch (status)
@@ -2902,6 +2901,10 @@ tp_base_connection_change_status (TpBaseConnection *self,
       return;
     }
 
+  /* now that we've finished return_if_fail'ing, we can start to make
+   * the actual changes */
+  self->status = status;
+
   /* ref self in case user callbacks unref us */
   g_object_ref (self);