--- GConf-2.14.0/gconf/gconfd.c.timeout	2006-09-18 12:19:24.000000000 -0400
+++ GConf-2.14.0/gconf/gconfd.c	2006-09-18 12:21:30.000000000 -0400
@@ -1151,18 +1151,20 @@
 static gboolean
 no_databases_in_use (void)
 {
-  /* Only the default database still open, and
-   * it has no listeners
-   */
+  GList *l;
 
-  if (db_list == NULL)
-    return TRUE;
+  for (l = db_list; l; l = l->next)
+    {	
+      GConfDatabase *db = l->data;
 
-  if (db_list->next == NULL &&
-      db_list->data == default_db)
-    return gconf_listeners_count (default_db->listeners) == 0;
+      if (gconf_listeners_count (db->listeners) > 0)
+	return FALSE;
 
-  return FALSE;
+      if (db->sync_timeout || db->sync_idle)
+	return FALSE;
+    }
+
+  return TRUE;
 }
 
 void