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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-03-06 18:30:57 +0200 (Thu, 06 Mar 2008)
New Revision: 15265

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 (get_folder_callback):
	Reverse order of calls to handle_finished_node and
	handle_load_error (N79056).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-03-06 16:30:48 UTC (rev 15264)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-03-06 16:30:57 UTC (rev 15265)
@@ -1,3 +1,12 @@
+2008-03-06  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-smb.c (strchr_reverse): Be more
+	constant.
+
+	* hildon-fm/hildon-file-system-model.c (get_folder_callback):
+	Reverse order of calls to handle_finished_node and
+	handle_load_error (N79056).
+
 2008-02-29  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-system-mmc.c,

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-03-06 16:30:48 UTC (rev 15264)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-03-06 16:30:57 UTC (rev 15265)
@@ -2,6 +2,7 @@
 
   * Fixes: NB#76517, NB#79427, NB#76380, NB#76271, NB#79697.
   * Fixes: NB#76327, NB#74397, NB#75049, NB#80021, NB#81354.
+  * Fixes: NB#79056.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 20 Feb 2008 16:42:40 +0200
 

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	2008-03-06 16:30:48 UTC (rev 15264)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2008-03-06 16:30:57 UTC (rev 15265)
@@ -1506,8 +1506,8 @@
   
   if (model_node->error)
     {
+      handle_finished_node (node);
       handle_load_error (node);
-      handle_finished_node (node);
       return;
     }