diff options
author | Havoc Pennington <hp@redhat.com> | 2003-04-28 19:29:42 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-04-28 19:29:42 +0000 |
commit | 893d859ed4ab785f46485fad28779f026fa166a1 (patch) | |
tree | 7e4791276313367c96ad042d711da409a22e902b /bus/config-parser.h | |
parent | e8d396efef695b9868b0112c4a6266c97678fa8a (diff) |
2003-04-28 Havoc Pennington <hp@redhat.com>dbus-0.10
* configure.in: 0.10
* NEWS: update
* bus/system.conf.in: add <includedir>system.d</includedir>
* dbus/dbus-userdb.c (_dbus_user_database_lookup): fix bug when
username was provided but not uid
* bus/config-parser.c (struct BusConfigParser): keep track of
whether the parser is toplevel or was included; change some
of the error handling if it's included.
Diffstat (limited to 'bus/config-parser.h')
-rw-r--r-- | bus/config-parser.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bus/config-parser.h b/bus/config-parser.h index acf868ef..eaeafdc5 100644 --- a/bus/config-parser.h +++ b/bus/config-parser.h @@ -35,7 +35,8 @@ typedef struct BusConfigParser BusConfigParser; -BusConfigParser* bus_config_parser_new (const DBusString *basedir); +BusConfigParser* bus_config_parser_new (const DBusString *basedir, + dbus_bool_t is_toplevel); void bus_config_parser_ref (BusConfigParser *parser); void bus_config_parser_unref (BusConfigParser *parser); dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser, @@ -71,6 +72,7 @@ void bus_config_parser_get_limits (BusConfigParser *parser, * finished ConfigParser. */ BusConfigParser* bus_config_load (const DBusString *file, + dbus_bool_t is_toplevel, DBusError *error); |