gconf r2587 - in trunk: . gconf

[kmaraas svn gnome org]

Author: kmaraas
Date: Wed May  7 10:35:27 2008
New Revision: 2587
URL: http://svn.gnome.org/viewvc/gconf?rev=2587&view=rev

Log:
2008-05-07  Richard Hult  <richard 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.

Modified:
   trunk/ChangeLog
   trunk/gconf/gconf-database.c

Modified: trunk/gconf/gconf-database.c
==============================================================================
--- trunk/gconf/gconf-database.c	(original)
+++ trunk/gconf/gconf-database.c	Wed May  7 10:35:27 2008
@@ -1261,11 +1261,10 @@
 
   g_slist_free (closure.dead);
 
-  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);