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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-17 15:46:59 +0300 (Mon, 17 Sep 2007)
New Revision: 13849

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:
	Make sure that empty folders are not stuck with a zero load_time
	forever.

	* hildon-fm/hildon-file-system-model.c
	(hildon_file_system_model_files_added): Do not set load_time here.
	(link_file_folder): Do it here (N68881).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-17 12:26:21 UTC (rev 13848)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-17 12:46:59 UTC (rev 13849)
@@ -1,5 +1,12 @@
 2007-09-13  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	Make sure that empty folders are not stuck with a zero load_time
+	forever.
+
+	* hildon-fm/hildon-file-system-model.c
+	(hildon_file_system_model_files_added): Do not set load_time here.
+	(link_file_folder): Do it here (N68881).
+
 	* hildon-fm/hildon-file-chooser-dialog.c
 	(hildon_file_chooser_dialog_create_sub_dialog): Make dialog
 	destroy with parent so that the parent can be programmatically

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-09-17 12:26:21 UTC (rev 13848)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-09-17 12:46:59 UTC (rev 13849)
@@ -8,7 +8,7 @@
   * Fixes: NB#65966, NB#61944, NB#63125, NB#68166, NB#66158.
   * Make libhildonfm2 depend on gnome-vfs-filechooser-backend since it
     doesn't really work with any other backend for now.  Fixes: NB#59466.
-  * Fixes: NB#59284, NB#60626, NB#67758.
+  * Fixes: NB#59284, NB#60626, NB#67758, NB#68881.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 14 Aug 2007 19:48:47 +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-09-17 12:26:21 UTC (rev 13848)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-17 12:46:59 UTC (rev 13849)
@@ -1207,7 +1207,6 @@
 	GtkTreeModel *model;
 
 	model_node = node->data;
-	model_node->load_time = time(NULL);
 	model = GTK_TREE_MODEL (model_node->model);
 
 	i = 0;
@@ -1557,6 +1556,8 @@
   model = model_node->model;
   g_assert(HILDON_IS_FILE_SYSTEM_MODEL(model));
 
+  model_node->load_time = time(NULL);
+
   ULOG_INFO_F("%s", (char *) path);
 
   if (!model_node->path)