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-loader-expat.c | |
| 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-loader-expat.c')
| -rw-r--r-- | bus/config-loader-expat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index 372a8867..3e45166d 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -164,6 +164,7 @@ expat_CharacterDataHandler (void *userData, BusConfigParser* bus_config_load (const DBusString *file, + dbus_bool_t is_toplevel, DBusError *error) { XML_Parser expat; @@ -207,7 +208,7 @@ bus_config_load (const DBusString *file, goto failed; } - parser = bus_config_parser_new (&dirname); + parser = bus_config_parser_new (&dirname, is_toplevel); if (parser == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); |