[maemo-commits] [maemo-commits] r12879 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-27 17:02:48 +0300 (Fri, 27 Jul 2007)
New Revision: 12879

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
patch from Markku for irritating focus bug


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-07-27 13:05:29 UTC (rev 12878)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-07-27 14:02:48 UTC (rev 12879)
@@ -9,6 +9,10 @@
 	* hildon-file-common-private.h: Add 'FM' macro for strings from
 	File manager's localisation domain.
 
+	* hildon-file-selection.c (hildon_file_selection_row_activated):
+	Apply Markku's patch to consume Gtk events before trying to change
+	the selected row, fixes focus behaviour. Fixes: NB#49941
+
 2007-07-26  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-selection.c

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-07-27 13:05:29 UTC (rev 12878)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-07-27 14:02:48 UTC (rev 12879)
@@ -11,6 +11,7 @@
   * Show information note sfil_ni_target_foldername_long instead of
     information banner file_ib_name_too_long. Fixes: NB#36630
   * Fixes: NB#59274
+  * Patch from Markku for irritating focus bug. Fixes: NB#49941
   
  -- Marius Vollmer <marius.vollmer at nokia.com>  Fri, 27 Jul 2007 14:09:28 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-07-27 13:05:29 UTC (rev 12878)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-07-27 14:02:48 UTC (rev 12879)
@@ -1695,11 +1695,18 @@
                                                 GtkTreeViewColumn * col,
                                                 gpointer data)
 {
+	
     GtkTreeIter iter;
     GtkTreeModel *model;
     GtkTreePath *filter_path = NULL, *base_path = NULL, *dir_path = NULL;
     gboolean is_folder, is_available;
 
+    /* Consume all events before activating a row
+       because there might be unfinished selection change
+       => wrong row might be activated */
+    while (gtk_events_pending())
+        gtk_main_iteration();
+
     model = gtk_tree_view_get_model(view); /* Content pane filter model */
 
     if (gtk_tree_model_get_iter(model, &iter, path)) {