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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-08-13 20:17:18 +0300 (Mon, 13 Aug 2007)
New Revision: 13168

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
	* hildon-fm/hildon-file-system-model.c (is_node_loaded): Also
	recognize nodes with a GtkFileFolder or get_folder_handle as
	folders.  Otherwise the root node (which hasn't a GtkFileInfo) is
	reported as loaded while it in fact isn't.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-08-13 14:38:03 UTC (rev 13167)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-08-13 17:17:18 UTC (rev 13168)
@@ -1,3 +1,10 @@
+2007-08-13  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-model.c (is_node_loaded): Also
+	recognize nodes with a GtkFileFolder or get_folder_handle as
+	folders.  Otherwise the root node (which hasn't a GtkFileInfo) is
+	reported as loaded while it in fact isn't.
+
 2007-08-02  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.37

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-08-13 14:38:03 UTC (rev 13167)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-08-13 17:17:18 UTC (rev 13168)
@@ -625,6 +625,8 @@
   /* Only folders need to be loaded.
    */
   if (model_node->location == NULL
+      && model_node->folder == NULL
+      && model_node->get_folder_handle == NULL
       && (model_node->info == NULL
 	  || !gtk_file_info_get_is_folder (model_node->info)))
     return TRUE;