summaryrefslogtreecommitdiffstats
path: root/bus/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'bus/main.c')
-rw-r--r--bus/main.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/bus/main.c b/bus/main.c
index f33ac2a3..08f2eb53 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -291,21 +291,15 @@ main (int argc, char **argv)
{
check_two_config_files (&config_file, "system");
- if (!_dbus_string_append (&config_file, DBUS_SYSTEM_CONFIG_FILE))
+ if (!_dbus_append_system_config_file (&config_file))
exit (1);
}
else if (strcmp (arg, "--session") == 0)
{
check_two_config_files (&config_file, "session");
-#ifdef DBUS_WIN
- if (!_dbus_get_config_file_name (&config_file,"session.conf"))
+ if (!_dbus_append_session_config_file (&config_file))
exit (1);
- /* don't know how to map DBUS_SESSION_CONFIG_FILE to the function above */
-#else
- if (!_dbus_string_append (&config_file, DBUS_SESSION_CONFIG_FILE))
- exit (1);
-#endif
}
else if (strstr (arg, "--config-file=") == arg)
{