empathy r2789 - trunk/libempathy-gtk

[xclaesse svn gnome org]

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

Log:
Fix reset status on Esc

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:25 2009
@@ -318,6 +318,13 @@
 }
 
 static void
+reset_status (EmpathyPresenceChooser *self)
+{
+	/* recover the status that was unset */
+	presence_chooser_presence_changed_cb (self);
+}
+
+static void
 entry_icon_release_cb (EmpathyPresenceChooser	*self,
 		       GtkEntryIconPosition	 icon_pos,
 		       GdkEvent		*event,
@@ -346,7 +353,7 @@
 	{
 		/* the user pressed Escape, undo the editing */
 		set_status_editing (self, FALSE);
-		presence_chooser_presence_changed_cb (self);
+		reset_status (self);
 
 		return TRUE;
 	}
@@ -363,6 +370,7 @@
 
 	GtkTreeIter iter;
 	char *icon_name;
+	McPresence new_state;
 	gboolean customisable = TRUE;
 	int type = -1;
 
@@ -379,7 +387,7 @@
 
 	gtk_tree_model_get (model, &iter,
 			COL_STATE_ICON_NAME, &icon_name,
-			COL_STATE, &priv->state,
+			COL_STATE, &new_state,
 			COL_STATUS_CUSTOMISABLE, &customisable,
 			COL_TYPE, &type,
 			-1);
@@ -394,18 +402,12 @@
 	if (type != ENTRY_TYPE_EDIT_CUSTOM)
 	{
 		gtk_editable_set_editable (GTK_EDITABLE (entry), customisable);
+		priv->state = new_state;
 	}
 
 	if (type == ENTRY_TYPE_EDIT_CUSTOM)
 	{
-		/* recover the status that was unset because COL_STATUS_TEXT
-		 * is "". Unfortunately if you try and set COL_STATUS_TEXT to
-		 * NULL, it generates a g_critical. I wonder if there is a
-		 * better way around this. */
-		const char *status = empathy_idle_get_status (priv->idle);
-		priv->block_set_editing++;
-		gtk_entry_set_text (GTK_ENTRY (entry), status);
-		priv->block_set_editing--;
+		reset_status (EMPATHY_PRESENCE_CHOOSER (self));
 
 		/* attempt to get the toplevel for this widget */
 		GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (self));
@@ -473,7 +475,7 @@
 
 	if (priv->editing_status)
 	{
-		entry_activate_cb (chooser, entry);
+		// entry_activate_cb (chooser, entry);
 	}
 
 	return FALSE;