summaryrefslogtreecommitdiff
path: root/bus/main.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-09-18 17:52:07 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-09-30 15:49:29 +0100
commit8b7f332bca062899c3d82e5ad18a31cf26fcbb7c (patch)
treeba63e70206fc198f66b3f79a5be77b82ed1373ed /bus/main.c
parent9f01817415efb937d8cf19f44eca005ba8f983be (diff)
downloaddbus-8b7f332bca062899c3d82e5ad18a31cf26fcbb7c.tar.gz
Rename getters for session, system config files
It turns out to be easier to implement the Windows version of these in a relocatable way if it can assume that the argument starts empty, which is in fact true in practice. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83539 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'bus/main.c')
-rw-r--r--bus/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bus/main.c b/bus/main.c
index ee5e1ebf..612b4a6c 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -440,14 +440,14 @@ main (int argc, char **argv)
{
check_two_config_files (&config_file, "system");
- if (!_dbus_append_system_config_file (&config_file))
+ if (!_dbus_get_system_config_file (&config_file))
exit (1);
}
else if (strcmp (arg, "--session") == 0)
{
check_two_config_files (&config_file, "session");
- if (!_dbus_append_session_config_file (&config_file))
+ if (!_dbus_get_session_config_file (&config_file))
exit (1);
}
else if (strstr (arg, "--config-file=") == arg)