summaryrefslogtreecommitdiff
path: root/gconf
diff options
context:
space:
mode:
authorRichard Hult <richard@imendio.com>2008-05-07 10:35:27 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2008-05-07 10:35:27 +0000
commit20302bb6f979fa48f6f2e3eadd9e1bc19149cfde (patch)
tree063e120405cdbe1e18a880bfb472473802b7172e /gconf
parent24bae6048fe7d1f732fb7cf411f5f69e7cf29f58 (diff)
downloadgconf-20302bb6f979fa48f6f2e3eadd9e1bc19149cfde.tar.gz
Get rid of critical warning (and crash when built with --disable-debug),
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. svn path=/trunk/; revision=2587
Diffstat (limited to 'gconf')
-rw-r--r--gconf/gconf-database.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c
index 00560cf8..d7da2312 100644
--- a/gconf/gconf-database.c
+++ b/gconf/gconf-database.c
@@ -1261,11 +1261,10 @@ gconf_database_notify_listeners (GConfDatabase *db,
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);