diff options
author | Colin Walters <walters@verbum.org> | 2010-02-02 12:37:17 -0500 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2010-02-02 15:04:45 -0500 |
commit | 90fe96b1875350f86a4a773d4a0a22009950dd4d (patch) | |
tree | 5dffa2b28c1d13c3a0902054ac8cd4d57f6c969e /bus/bus.c | |
parent | a7169e694c48c1259b51f62d73e92292d11bbab2 (diff) | |
download | dbus-90fe96b1875350f86a4a773d4a0a22009950dd4d.tar.gz |
Fix inotify shutdown
We were incorrectly passing NULL for a DBusList when the usage expected
is a pointer to a NULL DBusList pointer. Also during dbus_shutdown
we need to actually close the inotify fd, and remove our watch.
Move the shutdown handler out of bus.c and into inotify where we
can do all of this cleanly.
Diffstat (limited to 'bus/bus.c')
-rw-r--r-- | bus/bus.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -551,12 +551,6 @@ process_config_postinit (BusContext *context, return TRUE; } -static void -bus_shutdown_all_directory_watches (void *data) -{ - bus_set_watched_dirs ((BusContext *) data, NULL); -} - BusContext* bus_context_new (const DBusString *config_file, ForceForkSetting force_fork, @@ -588,8 +582,6 @@ bus_context_new (const DBusString *config_file, _dbus_generate_uuid (&context->uuid); - _dbus_register_shutdown_func (bus_shutdown_all_directory_watches, context); - if (!_dbus_string_copy_data (config_file, &context->config_file)) { BUS_SET_OOM (error); |