aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2009-04-11 00:55:10 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-04-11 00:55:10 +0800
commit39879eaa99954c8652a8a4e8f1cad84929e515c5 (patch)
tree33ed85a6d50aa97e08b7c3ba679c32d7273ef680
parentcf0bc93bf9078a3629b892e207e6ab4537d7a163 (diff)
downloadgsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.tar
gsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.tar.gz
gsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.tar.bz2
gsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.tar.lz
gsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.tar.xz
gsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.tar.zst
gsoc2013-empathy-39879eaa99954c8652a8a4e8f1cad84929e515c5.zip
Don't blat message if it updates whilst in editing mode
From: Davyd Madeley <davyd@madeley.id.au> svn path=/trunk/; revision=2802
-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);