diff options
author | Havoc Pennington <hp@redhat.com> | 2007-06-15 20:10:09 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2007-06-15 20:10:09 +0000 |
commit | b62633b919d481265d3fd75a5d32750dbdc41ddf (patch) | |
tree | 03aec003d7c1b9db757c03c39cace5b914b078d6 /bus/main.c | |
parent | 43b944a0a6ea48e8a8b06ae3e638299f591cde8d (diff) |
2007-06-15 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'bus/main.c')
-rw-r--r-- | bus/main.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -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) { |