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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-06-08 17:11:23 +0300 (Fri, 08 Jun 2007)
New Revision: 12212

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/debian/changelog
Log:


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-06-08 14:10:35 UTC (rev 12211)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-06-08 14:11:23 UTC (rev 12212)
@@ -1,3 +1,12 @@
+2007-06-08  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-root.c
+	(hildon_file_system_root_get_folder): Explicitly set file_system
+	of the handle to NULL.
+	* hildon-fm/hildon-file-system-model.c (unlink_file_folder): Do
+	not call gtk_file_system_cancel_operation when the file_system of
+	the handle is NULL, set the cancelled flag directly (N59441).
+
 2007-06-07  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-system-root.c

Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-06-08 14:10:35 UTC (rev 12211)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-06-08 14:11:23 UTC (rev 12212)
@@ -1,5 +1,5 @@
 AC_INIT(hildon-fm/hildon-file-system-model.c)
-AM_INIT_AUTOMAKE(libhildonfm, 1.9.28)
+AM_INIT_AUTOMAKE(libhildonfm, 1.9.29)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-06-08 14:10:35 UTC (rev 12211)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-06-08 14:11:23 UTC (rev 12212)
@@ -1,3 +1,9 @@
+libhildonfm (1:1.9.29~unreleased1) unstable; urgency=low
+
+  * Fixes: NB#59441.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Thu,  7 Jun 2007 16:35:49 +0300
+
 libhildonfm (1:1.9.28) unstable; urgency=low
 
   * More API for dealing with filename extensions.