[maemo-commits] [maemo-commits] r17289 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-01-27 14:30:54 +0200 (Tue, 27 Jan 2009)
New Revision: 17289

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-01-27  Kristian Rietveld  <kris at imendio.com>

	Fixes: NB#98806 - An unexpected item appears in some Email views when
	'Enter' HW key is pressed.

	* gtk/gtktreeview.c (gtk_tree_view_key_press): do not activate
	the interactive search mode when enter/space is pressed.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-01-27 11:27:26 UTC (rev 17288)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-01-27 12:30:54 UTC (rev 17289)
@@ -1,3 +1,11 @@
+2009-01-27  Kristian Rietveld  <kris at imendio.com>
+
+	Fixes: NB#98806 - An unexpected item appears in some Email views when
+	'Enter' HW key is pressed.
+
+	* gtk/gtktreeview.c (gtk_tree_view_key_press): do not activate
+	the interactive search mode when enter/space is pressed.
+
 2009-01-26  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Released 2:2.12.12-1maemo7

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-01-27 11:27:26 UTC (rev 17288)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-01-27 12:30:54 UTC (rev 17289)
@@ -6221,6 +6221,17 @@
    * the typeahead find capabilities. */
   if (GTK_WIDGET_HAS_FOCUS (tree_view)
       && tree_view->priv->enable_search
+#ifdef MAEMO_CHANGES
+      /* These are usually handled via keybindings, but these do not
+       * function in Fremantle mode.  Therefore we need to explicitly
+       * check for these there.
+       */
+      && event->keyval != GDK_ISO_Enter
+      && event->keyval != GDK_KP_Enter
+      && event->keyval != GDK_Return
+      && event->keyval != GDK_space
+      && event->keyval != GDK_KP_Space
+#endif /* MAEMO_CHANGES */
       && !tree_view->priv->search_custom_entry_set)
     {
       GdkEvent *new_event;