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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-28 14:28:50 +0300 (Fri, 28 Sep 2007)
New Revision: 14166

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): Call
	free:handle_data at the very end so that the HildonFileSystemModel
	remains reffed (N69754).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-28 11:28:01 UTC (rev 14165)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-28 11:28:50 UTC (rev 14166)
@@ -1,3 +1,9 @@
+2007-09-28  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-model.c (get_folder_callback): Call
+	free:handle_data at the very end so that the HildonFileSystemModel
+	remains reffed (N69754).
+
 2007-09-27  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-system-model.c (dfa_run,
@@ -5,7 +11,7 @@
 	hildon_file_system_model_folder_finished_loading): Gracefully
 	handle the case when the node for the GtkFileFolder has been
 	removed from the model in the mean time by doing nothing (N71163,
-	N71170, N71144).
+	N71170, N71144, N71168).
 
 2007-09-26  Marius Vollmer  <marius.vollmer at nokia.com>
 

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-09-28 11:28:01 UTC (rev 14165)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-09-28 11:28:50 UTC (rev 14166)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.41~unreleased) unstable; urgency=low
 
-  * 
+  * Fixes: NB#N71163, NB#71170, NB#71144, NB#71168, NB#69754.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 25 Sep 2007 09:56:09 +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-28 11:28:01 UTC (rev 14165)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-28 11:28:50 UTC (rev 14166)
@@ -1525,8 +1525,6 @@
      G_CALLBACK (hildon_file_system_model_folder_finished_loading), model,
      0);
 
-  free_handle_data (handle_data);
-
   /* The following has to be done last since it might do anything to
      model_node, including loading it again.
   */
@@ -1561,6 +1559,8 @@
       else
 	handle_load_error (node);
     }
+
+  free_handle_data (handle_data);
 }
 
 static gboolean