[maemo-commits] [maemo-commits] r16844 - in projects/haf/trunk/gconf2: . backends debian

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-12-03 12:44:07 +0200 (Wed, 03 Dec 2008)
New Revision: 16844

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/backends/markup-tree.c
   projects/haf/trunk/gconf2/debian/changelog
Log:
NB#93028

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2008-12-02 18:26:24 UTC (rev 16843)
+++ projects/haf/trunk/gconf2/ChangeLog	2008-12-03 10:44:07 UTC (rev 16844)
@@ -1,3 +1,8 @@
+2008-12-03  Richard Hult  <richard at imendio.com>
+
+	* backends/markup-tree.c (save_tree_with_locale): Use fdatasync to
+	flush the file before renaming.
+
 2008-10-28  Richard Hult  <richard at imendio.com>
 
 	* gconf/gconf-dbus.c: Patch from Ross Burton to use right the

Modified: projects/haf/trunk/gconf2/backends/markup-tree.c
===================================================================
--- projects/haf/trunk/gconf2/backends/markup-tree.c	2008-12-02 18:26:24 UTC (rev 16843)
+++ projects/haf/trunk/gconf2/backends/markup-tree.c	2008-12-03 10:44:07 UTC (rev 16844)
@@ -4384,6 +4384,7 @@
    */
   if (dir->entries == NULL && (!save_as_subtree || dir->subdirs == NULL))
     {
+      fdatasync (new_fd);
       close (new_fd);
       new_fd = -1;
       goto done_writing;
@@ -4464,6 +4465,13 @@
       goto done_writing;
     }
 
+  if (fdatasync (fileno (f)) < 0)
+    {
+      gconf_log (GCL_WARNING,
+                 _("Could not flush file '%s' to disk: %s"),
+                 new_filename, g_strerror (errno));
+    }
+
   if (fclose (f) < 0)
     {
       f = NULL; /* f is still freed even if fclose fails according to the

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2008-12-02 18:26:24 UTC (rev 16843)
+++ projects/haf/trunk/gconf2/debian/changelog	2008-12-03 10:44:07 UTC (rev 16844)
@@ -1,3 +1,9 @@
+gconf2 (2.16.0-2osso2) unstable; urgency=low
+
+  * NB#93028, GConf loses existing values when setting value and powering off
+
+ -- Richard Hult <richard at imendio.com>  Wed,  3 Dec 2008 08:26:00 +0100
+
 gconf2 (2.16.0-2osso1) unstable; urgency=low
 
   * Use correct match rule, to work properly with D-Bus 1.1+.