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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-09-10 12:46:43 +0300 (Mon, 10 Sep 2007)
New Revision: 13691

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2007-09-10  Kristian Rietveld  <kris at imendio.com>

	Merge from upstream:

	* gtk/gtktreeview.c (gtk_tree_view_key_press): only start
	typeahead search if tree_view has focus (and not one of the column
	buttons).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-10 09:07:44 UTC (rev 13690)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-10 09:46:43 UTC (rev 13691)
@@ -1,3 +1,11 @@
+2007-09-10  Kristian Rietveld  <kris at imendio.com>
+
+	Merge from upstream:
+
+	* gtk/gtktreeview.c (gtk_tree_view_key_press): only start
+	typeahead search if tree_view has focus (and not one of the column
+	buttons).
+
 2007-09-06  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtkwidget.c (gtk_widget_tap_and_hold_button_press): set

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-10 09:07:44 UTC (rev 13690)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-10 09:46:43 UTC (rev 13691)
@@ -5772,7 +5772,8 @@
 
   /* We pass the event to the search_entry.  If its text changes, then we start
    * the typeahead find capabilities. */
-  if (tree_view->priv->enable_search
+  if (GTK_WIDGET_HAS_FOCUS (tree_view)
+      && tree_view->priv->enable_search
       && !tree_view->priv->search_custom_entry_set)
     {
       GdkEvent *new_event;