empathy r2794 - trunk/libempathy-gtk

[xclaesse svn gnome org]

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

Log:
Fix regression where going offline was overwriting the saved status message

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:54:42 2009
@@ -698,11 +698,12 @@
 
 	if (match)
 	{
+		priv->block_changed++;
 		gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser), &iter);
+		priv->block_changed--;
 	}
 	else
 	{
-		// FIXME - do we insert the match into the menu?
 		ui_set_custom_state (chooser, state, status);
 	}