[maemo-commits] [maemo-commits] r14259 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-10-02 13:47:59 +0300 (Tue, 02 Oct 2007)
New Revision: 14259

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
	* hildon-fm/hildon-file-system-model.c
	(is_drive): New.
	(hildon_file_system_model_get_value): Use it.
	(is_node_loaded): Drives are always loaded.


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-02 10:33:53 UTC (rev 14258)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-10-02 10:47:59 UTC (rev 14259)
@@ -612,6 +612,12 @@
 }
 
 static gboolean
+is_drive (HildonFileSystemModelNode *m)
+{
+  g_str_has_prefix (gtk_file_path_get_string (m->path), "drive://");
+}
+
+static gboolean
 is_node_loaded (GNode * node)
 {
   HildonFileSystemModelNode *model_node = node->data;
@@ -626,6 +632,7 @@
     return TRUE;
 
   return (model_node->error 
+	  || is_drive (model_node)
 	  || (model_node->folder
 	      && gtk_file_folder_is_finished_loading (model_node->folder)
 	      && model_node->pending_adds == 0));
@@ -1016,9 +1023,7 @@
                 hildon_file_system_special_location_get_extra_info(model_node->location));
         break;
     case HILDON_FILE_SYSTEM_MODEL_COLUMN_IS_DRIVE:
-        g_value_set_boolean (value,
-			     g_str_has_prefix (gtk_file_path_get_string (path),
-					       "drive://"));
+        g_value_set_boolean (value, is_drive (model_node));
         break;
     default:
         g_assert_not_reached();