[maemo-commits] [maemo-commits] r15559 - in projects/haf/trunk/gconf2: . gconf

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-05-15 09:49:08 +0300 (Thu, 15 May 2008)
New Revision: 15559

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c
Log:
Prepare for release

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2008-05-14 15:45:53 UTC (rev 15558)
+++ projects/haf/trunk/gconf2/ChangeLog	2008-05-15 06:49:08 UTC (rev 15559)
@@ -1,3 +1,10 @@
+2008-05-15  Richard Hult  <richard at imendio.com>
+
+	* gconf/gconf-database-dbus.c (gconf_database_notify_listeners):
+	Get rid of critical warning (and crash when built with
+	--disable-debug), when unsetting a key that has no writable
+	sources.
+
 2008-05-09  Richard Hult  <richard at imendio.com>
 
 	* gconf/gconf-client.c (gconf_client_flush_notifies): If the key

Modified: projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c	2008-05-14 15:45:53 UTC (rev 15558)
+++ projects/haf/trunk/gconf2/gconf/gconf-database-dbus.c	2008-05-15 06:49:08 UTC (rev 15559)
@@ -966,13 +966,12 @@
 
     
   g_free (dir);
-  
-  if (notify_others)
+
+  if (modified_sources)
     {
-      g_return_if_fail (modified_sources != NULL);
-      
-      gconfd_notify_other_listeners (db, modified_sources, key);
-      
+      if (notify_others)
+        gconfd_notify_other_listeners (db, modified_sources, key);
+
       g_list_free (modified_sources->sources);
       g_free (modified_sources);
     }