empathy r2802 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr 10 16:55:10 2009
New Revision: 2802
URL: http://svn.gnome.org/viewvc/empathy?rev=2802&view=rev

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

From: Davyd Madeley <davyd madeley id au>

Modified:
   trunk/libempathy-gtk/empathy-presence-chooser.c

Modified: trunk/libempathy-gtk/empathy-presence-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-presence-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-presence-chooser.c	Fri Apr 10 16:55:10 2009
@@ -349,8 +349,8 @@
 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 @@
 
 	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);