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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 18:34:50 +0200 (Wed, 20 Feb 2008)
New Revision: 15211

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:
	* hildon-fm/hildon-file-selection.c
	(hildon_file_selection_matches_current_view): Also recognize a
	path that has just been deleted (N79697).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 15:07:15 UTC (rev 15210)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:34:50 UTC (rev 15211)
@@ -1,5 +1,9 @@
 2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-selection.c
+	(hildon_file_selection_matches_current_view): Also recognize a
+	path that has just been deleted (N79697).
+	
 	* hildon-fm/hildon-file-system-model.c (handle_finished_node): Do
 	not kick nodes that are in the process of being linked (N76271).
 

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 15:07:15 UTC (rev 15210)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:34:50 UTC (rev 15211)
@@ -1,6 +1,6 @@
 libhildonfm (1:2.0.1~unreleased) unstable; urgency=low
 
-  * Fixes: NB#76517, NB#79427, NB#76380, NB#76271.
+  * Fixes: NB#76517, NB#79427, NB#76380, NB#76271, NB#79697.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 20 Feb 2008 16:42:40 +0200
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-02-20 15:07:15 UTC (rev 15210)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-02-20 16:34:50 UTC (rev 15211)
@@ -1240,14 +1240,18 @@
 {
     if (GTK_IS_TREE_MODEL_FILTER(priv->view_filter)) {
         GtkTreePath *current_path;
-        gint result;
+        gint result = 1;
+        GtkTreeIter iter;
 
         g_object_get(priv->view_filter, "virtual-root", &current_path,
                      NULL);
 
         g_assert(current_path); /* Content pane should always have root
                                    (no local device level allowed) */
-        result = gtk_tree_path_compare(path, current_path);
+        if (!gtk_tree_path_compare(path, current_path) && gtk_tree_model_get_iter(priv->view_filter, &iter, current_path)) 
+                /* after deleting a folder the new and current (deleted) paths are same 
+                   but gtk_tree_model_get_iter() returns FALSE for the current (deleted) path */
+                result = 0;
         gtk_tree_path_free(current_path);
 
         return (result == 0);