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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-26 13:29:40 +0300 (Wed, 26 Sep 2007)
New Revision: 14104

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
	(hildon_file_system_model_files_added): Call handle_finished_node
	when the node is now loaded.
	(is_node_loaded): Removed priv parameter, it was unused.  Changed
	all callers.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-26 10:12:22 UTC (rev 14103)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-26 10:29:40 UTC (rev 14104)
@@ -1,3 +1,11 @@
+2007-09-26  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-model.c
+	(hildon_file_system_model_files_added): Call handle_finished_node
+	when the node is now loaded.
+	(is_node_loaded): Removed priv parameter, it was unused.  Changed
+	all callers.
+
 2007-09-24  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.40

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-09-26 10:12:22 UTC (rev 14103)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-26 10:29:40 UTC (rev 14104)
@@ -179,8 +179,7 @@
                                                       GtkFileFolder *
                                                       folder,
                                                       GSList * children);
- static gboolean is_node_loaded(HildonFileSystemModelPrivate *priv,
-                                      GNode * node);
+static gboolean is_node_loaded (GNode * node);
 static GNode *
 hildon_file_system_model_kick_node(GNode *node, gpointer data);
 static void
@@ -613,8 +612,7 @@
 }
 
 static gboolean
-is_node_loaded (HildonFileSystemModelPrivate *priv,
-		GNode * node)
+is_node_loaded (GNode * node)
 {
   HildonFileSystemModelNode *model_node = node->data;
 
@@ -943,7 +941,7 @@
         update_cache_queue(priv, node);
         break;
     case HILDON_FILE_SYSTEM_MODEL_COLUMN_LOAD_READY:
-        g_value_set_boolean(value, is_node_loaded(priv, node));
+        g_value_set_boolean(value, is_node_loaded(node));
         break;
     case HILDON_FILE_SYSTEM_MODEL_COLUMN_FREE_SPACE:
         g_warning("USING FREE SPACE COLUMN IS DEPRECATED");
@@ -1163,6 +1161,7 @@
   model_node->pending_adds -= g_slist_length (c->paths);
 
   hildon_file_system_model_files_added (c->monitor, c->paths, c->data);
+
   GDK_THREADS_LEAVE ();
 
   g_object_unref (c->monitor);
@@ -1244,9 +1243,12 @@
 
 	if (paths)
 	  delay_files_added (monitor, paths, data);
+
+	if (is_node_loaded (node))
+	  handle_finished_node (node);
       }
     else
-        ULOG_ERR_F("Data destination not found!");
+      ULOG_ERR_F("Data destination not found!");
   }
 }
 
@@ -1300,7 +1302,8 @@
   GNode *node = hildon_file_system_model_search_folder(monitor);
   g_assert(node != NULL);
   ULOG_INFO("Finished loading (monitor = %p)", (void *) monitor);
-  handle_finished_node (node);
+  if (is_node_loaded (node))
+    handle_finished_node (node);
 }
 
 static GNode *
@@ -2004,7 +2007,7 @@
 					     be a folder */
   {
     ULOG_INFO("Waiting folder [%s] to load", (char *) model_node->path);
-    while (!is_node_loaded(priv, node))
+    while (!is_node_loaded(node))
     {
         g_usleep(2000); /* microseconds */
         if (gtk_events_pending())       /* Don't do while here, because
@@ -2920,13 +2923,13 @@
   parent_node = parent_iter->user_data;
   parent_model_node = parent_node->data;
 
-  if (!is_node_loaded (model->priv, parent_node))
+  if (!is_node_loaded (parent_node))
     {
       if (parent_model_node->get_folder_handle == NULL)
 	link_file_folder (parent_node, parent_model_node->path);
       else
 	DBG ("NOT LINKING %s\n",  (char *)parent_model_node->path);
-      while (!is_node_loaded (model->priv, parent_node)
+      while (!is_node_loaded (parent_node)
 	     && time (NULL) < max_time)
 	{
 	  DBG ("-");
@@ -2990,7 +2993,7 @@
     treemodel = GTK_TREE_MODEL(model);
     node = parent->user_data;
 
-    if (!is_node_loaded(model->priv, node))
+    if (!is_node_loaded(node))
       return NULL;
 
     model_node = node->data;