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

[From: subversion at stage.maemo.org]

Author: fherrera
Date: 2007-08-13 15:43:37 +0300 (Mon, 13 Aug 2007)
New Revision: 13156

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2007-08-13  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>

        * gtk/gtktreeview.c: (gtk_tree_view_move_cursor_up_down): Backport
        uptream fix for 465039 (keynav-failed not emitted when treeview has
        only one element). Fixes: NB#60882




Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-08-13 12:24:55 UTC (rev 13155)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-08-13 12:43:37 UTC (rev 13156)
@@ -1,3 +1,9 @@
+2007-08-13  Fernando Herrera  <fernando.herrera-de-las-heras at nokia.com>
+
+	* gtk/gtktreeview.c: (gtk_tree_view_move_cursor_up_down): Backport
+	uptream fix for 465039 (keynav-failed not emitted when treeview has
+	only one element). Fixes: NB#60882
+
 2007-08-13  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkmain.c (gtk_main_do_event): also send the insensitive-press signal

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-08-13 12:24:55 UTC (rev 13155)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-08-13 12:43:37 UTC (rev 13156)
@@ -10090,7 +10090,7 @@
 
   /*
    * If the list has only one item and multi-selection is set then select
-   * the row.
+   * the row (if not yet selected).
    */
   if (tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE &&
       new_cursor_node == NULL)
@@ -10102,7 +10102,8 @@
         _gtk_rbtree_prev_full (cursor_tree, cursor_node,
 			       &new_cursor_tree, &new_cursor_node);
 
-      if (new_cursor_node == NULL)
+      if (new_cursor_node == NULL
+	  && !GTK_RBNODE_FLAG_SET (cursor_node, GTK_RBNODE_IS_SELECTED))
         {
           new_cursor_node = cursor_node;
           new_cursor_tree = cursor_tree;