summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2004-08-30 07:12:33 +0000
committerMark McLoughlin <markmc@src.gnome.org>2004-08-30 07:12:33 +0000
commitf7e7979162fd89ed3c9ad0fdc40366929171968b (patch)
treecba0c47782d992ef5e0273e19f7f0539baf4807d
parentea922726a32cd8386e9badd948ec05c58b450457 (diff)
downloadgconf-f7e7979162fd89ed3c9ad0fdc40366929171968b.tar.gz
Lots of debugging info from Mickey Stein <yekkim@pacbell.net> narrowed
2004-08-30 Mark McLoughlin <mark@skynet.ie> Lots of debugging info from Mickey Stein <yekkim@pacbell.net> narrowed this one down in bug #150779. * gconf/gconfd.c: (drop_old_databases): don't drop the default database here, we do that later. Hangover from the fact that the default database didn't use to be on db_list.
-rw-r--r--ChangeLog9
-rw-r--r--gconf/gconfd.c6
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ae2b9297..edd18b36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2004-08-30 Mark McLoughlin <mark@skynet.ie>
+ Lots of debugging info from Mickey Stein <yekkim@pacbell.net>
+ narrowed this one down in bug #150779.
+
+ * gconf/gconfd.c: (drop_old_databases): don't drop the default
+ database here, we do that later. Hangover from the fact that
+ the default database didn't use to be on db_list.
+
+2004-08-30 Mark McLoughlin <mark@skynet.ie>
+
Patch from Josselin Mouette <joss@debian.org> in bug #148028
* gconf/gconfd.c: (periodic_cleanup_timeout): save and reload
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 274ee322..ead6e970 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -1023,6 +1023,12 @@ drop_old_databases(void)
{
GConfDatabase* db = tmp_list->data;
+ if (db == default_db)
+ {
+ tmp_list = g_list_next (tmp_list);
+ continue;
+ }
+
/* Drop any listeners whose clients are gone. */
gconf_database_drop_dead_listeners (db);