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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-03-18 17:08:18 +0200 (Tue, 18 Mar 2008)
New Revision: 15300

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:
revert fix for NB#79697


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-03-18 14:27:39 UTC (rev 15299)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-03-18 15:08:18 UTC (rev 15300)
@@ -1,3 +1,9 @@
+2008-18-03  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	* hildon-fm/hildon-file-selection.c
+	(hildon_file_selection_matches_current_view): Revert patch to fix
+	N79697. It made Bookmarks to jam and then crash.
+
 2008-03-06  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 2.0.1

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-03-18 14:27:39 UTC (rev 15299)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-03-18 15:08:18 UTC (rev 15300)
@@ -1,8 +1,8 @@
 libhildonfm (1:2.0.2~unreleased) unstable; urgency=low
 
-  * 
+  * Reverted the patch for NB#79697, it made Bookmarks to crash in startup.
 
- -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 06 Mar 2008 18:47:37 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 18 Mar 2008 16:56:44 +0200
 
 libhildonfm (1:2.0.1) unstable; urgency=low
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-03-18 14:27:39 UTC (rev 15299)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-03-18 15:08:18 UTC (rev 15300)
@@ -1240,18 +1240,14 @@
 {
     if (GTK_IS_TREE_MODEL_FILTER(priv->view_filter)) {
         GtkTreePath *current_path;
-        gint result = 1;
-        GtkTreeIter iter;
+        gint result;
 
         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) */
-        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;
+        result = gtk_tree_path_compare(path, current_path);
         gtk_tree_path_free(current_path);
 
         return (result == 0);