diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-09-20 13:47:23 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-09-20 13:48:28 +0200 |
| commit | 36d864e4697bc6e1eeffb32092bd78b108362ab5 (patch) | |
| tree | 2a1be313765cf5d74a783f03173aadb192cc8045 /dbus/dbus-sysdeps-util-win.c | |
| parent | 0a6310fe16d56cfcf1d3eea46b71a18ad5fe02a1 (diff) | |
Make Windows dbus-daemon look for the config file we install
The canonical location for bus setup changed from
${sysconfdir}/dbus-1 to ${datadir}/dbus-1 (or their CMake
equivalents) in version 1.9.18.
Also stop trying to use bus/session.conf from the build tree,
which will not work if our ${prefix} contains an older
${sysconfdir}/dbus-1/session.conf.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Diffstat (limited to 'dbus/dbus-sysdeps-util-win.c')
| -rw-r--r-- | dbus/dbus-sysdeps-util-win.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index e83c5397..57c353e9 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -1647,6 +1647,28 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs) return TRUE; } +static dbus_bool_t +_dbus_get_config_file_name (DBusString *str, + const char *basename) +{ + DBusString tmp; + + if (!_dbus_string_append (str, _dbus_windows_get_datadir ())) + return FALSE; + + _dbus_string_init_const (&tmp, "dbus-1"); + + if (!_dbus_concat_dir_and_file (str, &tmp)) + return FALSE; + + _dbus_string_init_const (&tmp, basename); + + if (!_dbus_concat_dir_and_file (str, &tmp)) + return FALSE; + + return TRUE; +} + /** * Append the absolute path of the system.conf file * (there is no system bus on Windows so this can just |