Don't blat message if it updates whilst in editing mode

From: Davyd Madeley <davyd@madeley.id.au>

svn path=/trunk/; revision=2802

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index ba55af1b89f453793143dc243eb4eb46e6d5e6c7..a31f1fc4b2099af2fd7da1b0094dc0d66cc965e9 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -349,8 +349,8 @@ static void
 presence_chooser_reset_status (EmpathyPresenceChooser *self)
 {
        /* recover the status that was unset */
-       presence_chooser_presence_changed_cb (self);
        presence_chooser_set_status_editing (self, FALSE);
+       presence_chooser_presence_changed_cb (self);
 }
 
 static void
@@ -703,6 +703,8 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
 
        priv = GET_PRIV (chooser);
 
+       if (priv->editing_status) return;
+
        priv->state = state = empathy_idle_get_state (priv->idle);
        status = empathy_idle_get_status (priv->idle);
        flash_state = empathy_idle_get_flash_state (priv->idle);