From: Davyd Madeley <davyd@madeley.id.au>
Date: Fri, 10 Apr 2009 16:54:42 +0000 (+0000)
Subject: Fix regression where going offline was overwriting the saved status message
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=4976ba9c8adcb8ec0cf5eef22b99fe31b4bff2e7

Fix regression where going offline was overwriting the saved status message

From: Davyd Madeley <davyd@madeley.id.au>

svn path=/trunk/; revision=2794
---

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 4ab17d3b..bfdc20a1 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -698,11 +698,12 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
 
 	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);
 	}