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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-10-09 11:23:05 +0300 (Tue, 09 Oct 2007)
New Revision: 14368

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
	* hildon-fm/hildon-file-system-model.c
	(hildon_file_system_model_load_uri,
	hildon_file_system_model_load_path): Block for
	first_root_scan_completed to be true in
	hildon_file_system_model_load_path, not in
	hildon_file_system_model_load_uri.  Not everybody uses
	hildon_file_system_model_load_uri (N61856).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-10-09 07:06:34 UTC (rev 14367)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-10-09 08:23:05 UTC (rev 14368)
@@ -1,5 +1,16 @@
 2007-10-08  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-system-model.c
+	(hildon_file_system_model_load_uri,
+	hildon_file_system_model_load_path): Block for
+	first_root_scan_completed to be true in
+	hildon_file_system_model_load_path, not in
+	hildon_file_system_model_load_uri.  Not everybody uses
+	hildon_file_system_model_load_uri (N61856).
+	
+	* hildon-fm/hildon-file-details-dialog.c (do_line_wrapping): Made
+	static.
+
 	* hildon-fm/hildon-file-details-dialog.c (do_line_wrapping): New.
 	(hildon_file_details_dialog_init): Call it when the dialog is
 	shown (N53155).

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-10-09 07:06:34 UTC (rev 14367)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-10-09 08:23:05 UTC (rev 14368)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.43~unreleased) unstable; urgency=low
 
-  * Fixes: NB#53155.
+  * Fixes: NB#53155, NB#61856.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 02 Oct 2007 15:31:36 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-10-09 07:06:34 UTC (rev 14367)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-10-09 08:23:05 UTC (rev 14368)
@@ -2761,17 +2761,6 @@
       while (!_hildon_file_system_settings_ready(settings))
         gtk_main_iteration();
     }
-
-    /* Block until the first scanning of the root folder is complete
-       so that we know about all memory cards, usb mass storage
-       devices, etc.
-    */
-    while (!priv->first_root_scan_completed)
-      {
-	DBG ("+");
-	gtk_main_iteration();
-      }
-    DBG ("DONE\n");
        
     result = hildon_file_system_model_load_path(model, filepath, iter);
 
@@ -2796,6 +2785,7 @@
                                             const GtkFilePath * path,
                                             GtkTreeIter * iter)
 {
+    HildonFileSystemModelPrivate *priv = CAST_GET_PRIVATE(model);
     GtkFilePath *parent_path;
     GtkTreeIter parent_iter;
 
@@ -2805,6 +2795,17 @@
 
     DBG ("LOAD %s\n", (char *)path);
 
+    /* Block until the first scanning of the root folder is complete
+       so that we know about all memory cards, usb mass storage
+       devices, etc.
+    */
+    while (!priv->first_root_scan_completed)
+      {
+	DBG ("+");
+	gtk_main_iteration();
+      }
+    DBG ("DONE\n");
+
     /* Let's see if given path is already in the tree */
     if (hildon_file_system_model_search_path(model, path, iter,
                                              NULL, TRUE))