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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2008-04-01 10:50:47 +0300 (Tue, 01 Apr 2008)
New Revision: 15330

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/debian/changelog
   projects/haf/trunk/gconf2/gconf/gconf-database.c
Log:
NB#82891

Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2008-03-31 18:37:26 UTC (rev 15329)
+++ projects/haf/trunk/gconf2/ChangeLog	2008-04-01 07:50:47 UTC (rev 15330)
@@ -1,3 +1,10 @@
+2008-03-31  Richard Hult  <richard at imendio.com>
+
+	* gconf/gconf-database.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-03-05  Richard Hult  <richard at imendio.com>
 
 	* gconf/gconf-client.c (remove_key_from_cache_recursively_foreach):

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2008-03-31 18:37:26 UTC (rev 15329)
+++ projects/haf/trunk/gconf2/debian/changelog	2008-04-01 07:50:47 UTC (rev 15330)
@@ -1,3 +1,9 @@
+gconf2 (2.16.0-1osso12) unstable; urgency=low
+
+  * Fixes: NB#82891, connectivity core-dumps are generating frequently
+
+ -- Richard Hult <richard at imendio.com>  Tue,  1 Apr 2008 09:48:03 +0200
+
 gconf2 (2.16.0-1osso11) unstable; urgency=low
 
   * Fixes: NB#81729, Dmsessiond crash caused by gconf

Modified: projects/haf/trunk/gconf2/gconf/gconf-database.c
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf-database.c	2008-03-31 18:37:26 UTC (rev 15329)
+++ projects/haf/trunk/gconf2/gconf/gconf-database.c	2008-04-01 07:50:47 UTC (rev 15330)
@@ -1288,12 +1288,11 @@
       tmp = g_slist_next(tmp);
     }
 
-  if (notify_others)
+  if (modified_sources)
     {
-      g_return_if_fail (modified_sources != NULL);
+      if (notify_others)
+          gconfd_notify_other_listeners (db, modified_sources, key);
 
-      gconfd_notify_other_listeners (db, modified_sources, key);
-
       g_list_free (modified_sources->sources);
       g_free (modified_sources);
     }