diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2005-06-13 16:51:14 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@src.gnome.org> | 2005-06-13 16:51:14 +0000 |
| commit | 6fad3816fc1e171b5aa8ef5ae0a5c5c634e39440 (patch) | |
| tree | d8057fce4a9ddd67ce325c541f3d8eebf274cbaf | |
| parent | 7546bf37e13ac6e3966d0de6113de6089c3cd260 (diff) | |
| download | gconf-6fad3816fc1e171b5aa8ef5ae0a5c5c634e39440.tar.gz | |
Fixes bug #306937 - gconfd-2 not shutting down when its no longer in use.
2005-06-13 Mark McLoughlin <mark@skynet.ie>
Fixes bug #306937 - gconfd-2 not shutting down when its
no longer in use.
* gconf/gconfd.c: (no_databases_in_use): account for the
fact that the default database is on the global list of
databases now too.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gconf/gconfd.c | 11 |
2 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2005-06-13 Mark McLoughlin <mark@skynet.ie> + + Fixes bug #306937 - gconfd-2 not shutting down when its + no longer in use. + + * gconf/gconfd.c: (no_databases_in_use): account for the + fact that the default database is on the global list of + databases now too. + 2005-05-06 Mark McLoughlin <mark@skynet.ie> Small fix for previous commit. diff --git a/gconf/gconfd.c b/gconf/gconfd.c index ad65fa09..49307138 100644 --- a/gconf/gconfd.c +++ b/gconf/gconfd.c @@ -1094,8 +1094,15 @@ no_databases_in_use (void) /* Only the default database still open, and * it has no listeners */ - return db_list == NULL && - gconf_listeners_count (default_db->listeners) == 0; + + if (db_list == NULL) + return TRUE; + + if (db_list->next == NULL && + db_list->data == default_db) + return gconf_listeners_count (default_db->listeners) == 0; + + return FALSE; } void |