empathy r2785 - trunk/libempathy-gtk

[xclaesse svn gnome org]

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

Log:
When editing custom messages, preseed the entry with the current status

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:11 2009
@@ -269,6 +269,7 @@
 			/* unset the focus */
 			gtk_window_set_focus (GTK_WINDOW (window), NULL);
 		}
+		gtk_editable_set_position (GTK_EDITABLE (entry), 0);
 
 		priv->editing_status = FALSE;
 	}
@@ -404,6 +405,12 @@
 				GTK_ENTRY_ICON_PRIMARY,
 				icon_name);
 
+		/* preseed the status */
+		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--;
+
 		/* grab the focus */
 		gtk_widget_grab_focus (entry);