gossip r2825 - in trunk: . src

[mr svn gnome org]

Author: mr
Date: Mon Jul  7 13:51:45 2008
New Revision: 2825
URL: http://svn.gnome.org/viewvc/gossip?rev=2825&view=rev

Log:
Fixes bug 536683, Find entry behavior a little bit confusing


Modified:
   trunk/ChangeLog
   trunk/src/gossip-app.c

Modified: trunk/src/gossip-app.c
==============================================================================
--- trunk/src/gossip-app.c	(original)
+++ trunk/src/gossip-app.c	Mon Jul  7 13:51:45 2008
@@ -1128,6 +1128,26 @@
 				    GdkEventKey *event,
 				    GossipApp   *app)
 {
+	GossipAppPriv *priv;
+
+	priv = GET_PRIV (app);
+
+	/* Only do the following actions if escape is pressed */
+	if (event->keyval != GDK_Escape) {
+		return FALSE;
+	}
+
+	/* First if we have the find entry up, clear the filter and
+	 * hide the widgets.
+	 */
+	if (GTK_WIDGET_VISIBLE (priv->find_hbox)) {
+		gtk_entry_set_text (GTK_ENTRY (priv->find_entry), "");
+		gtk_widget_hide (priv->find_hbox);
+
+		return FALSE;
+	}
+
+	/* Second assume we want to hide the window */
 	if (event->keyval == GDK_Escape) {
 		gossip_app_toggle_visibility ();
 	}