From b62633b919d481265d3fd75a5d32750dbdc41ddf Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 15 Jun 2007 20:10:09 +0000 Subject: 2007-06-15 Havoc Pennington * dbus/dbus-sysdeps-unix.c (_dbus_append_session_config_file) (_dbus_append_system_config_file): new functions * bus/main.c (main): use _dbus_append_system_config_file() and _dbus_append_session_config_file() * dbus/Makefile.am (INCLUDES): move DBUS_SYSTEM_CONFIG_FILE and DBUS_SESSION_CONFIG_FILE into this makefile --- bus/main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'bus/main.c') 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) { -- cgit