aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index ba55af1b8..a31f1fc4b 100644
--- 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);