From 39879eaa99954c8652a8a4e8f1cad84929e515c5 Mon Sep 17 00:00:00 2001 From: Davyd Madeley Date: Fri, 10 Apr 2009 16:55:10 +0000 Subject: [PATCH] Don't blat message if it updates whilst in editing mode From: Davyd Madeley svn path=/trunk/; revision=2802 --- libempathy-gtk/empathy-presence-chooser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index ba55af1b..a31f1fc4 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); -- 2.39.2