diff options
author | David Zeuthen <davidz@redhat.com> | 2005-06-15 02:31:38 +0000 |
---|---|---|
committer | David Zeuthen <davidz@redhat.com> | 2005-06-15 02:31:38 +0000 |
commit | 1d19fc62e9034cc5700c0903f68787a84f485315 (patch) | |
tree | 6d0da2b8c889fefa111cc695b42d4b83e97ff237 /bus/config-parser.h | |
parent | 50f85baa3d92657a6c77c450a8f6dc34206e0610 (diff) | |
download | dbus-1d19fc62e9034cc5700c0903f68787a84f485315.tar.gz |
2005-06-14 David Zeuthen <davidz@redhat.com>
* bus/bus.c (process_config_every_time): Drop existing conf-dir
watches (if applicable) and add new watches
* bus/main.c (signal_handler): Handle SIGIO if using D_NOTIFY
(main): Setup SIGIO signal handler if using D_NOTIFY
* bus/config-parser.h: Add prototype bus_config_parser_get_conf_dirs
* bus/config-parser.c (struct BusConfigParser): Add conf_dirs list
(merge_included): Also merge conf_dirs list
(bus_config_parser_unref): Clear conf_dirs list
(include_dir): Add directory to conf_dirs list
(bus_config_parser_get_conf_dirs): New function
* bus/dir-watch.[ch]: New files
* bus/Makefile.am (BUS_SOURCES): Add dir-watch.[ch]
* configure.in: Add checks for D_NOTIFY on Linux
Diffstat (limited to 'bus/config-parser.h')
-rw-r--r-- | bus/config-parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/config-parser.h b/bus/config-parser.h index 388704db..657b0aef 100644 --- a/bus/config-parser.h +++ b/bus/config-parser.h @@ -67,6 +67,7 @@ DBusList** bus_config_parser_get_mechanisms (BusConfigParser *parser); dbus_bool_t bus_config_parser_get_fork (BusConfigParser *parser); const char* bus_config_parser_get_pidfile (BusConfigParser *parser); DBusList** bus_config_parser_get_service_dirs (BusConfigParser *parser); +DBusList** bus_config_parser_get_conf_dirs (BusConfigParser *parser); BusPolicy* bus_config_parser_steal_policy (BusConfigParser *parser); void bus_config_parser_get_limits (BusConfigParser *parser, BusLimits *limits); @@ -81,5 +82,4 @@ BusConfigParser* bus_config_load (const DBusString *file, const BusConfigParser *parent, DBusError *error); - #endif /* BUS_CONFIG_PARSER_H */ |