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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-09-06 16:51:59 +0300 (Thu, 06 Sep 2007)
New Revision: 13646

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

	* gtk/gtktreeview.c (gtk_tree_view_focus): bail out if can-focus is
	FALSE. (NB#65181).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-06 13:49:19 UTC (rev 13645)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-06 13:51:59 UTC (rev 13646)
@@ -1,3 +1,8 @@
+2007-09-06  Kristian Rietveld  <kris at imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_focus): bail out if can-focus is
+	FALSE. (NB#65181).
+
 2007-09-03  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_real_expand_collapse_cursor):

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-06 13:49:19 UTC (rev 13645)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-06 13:51:59 UTC (rev 13646)
@@ -8279,7 +8279,11 @@
   container = GTK_CONTAINER (widget);
   tree_view = GTK_TREE_VIEW (widget);
 
-  if (!GTK_WIDGET_IS_SENSITIVE (container))
+  if (!GTK_WIDGET_IS_SENSITIVE (container)
+#ifdef MAEMO_CHANGES
+      || !GTK_WIDGET_CAN_FOCUS (widget)
+#endif /* MAEMO_CHANGES */
+      )
     return FALSE;
 
   focus_child = container->focus_child;