From 80f895b6f786714e8494ef04784601cc0a388139 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 30 Oct 2015 06:02:04 +0100 Subject: [PATCH] Fix runtime path of DBUS_DATADIR. --- bus/config-parser.c | 9 +++------ dbus/dbus-sysdeps-util-win.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bus/config-parser.c b/bus/config-parser.c index 3f59730..502eef1 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3407,12 +3407,9 @@ test_default_session_servicedirs (void) const char *common_progs; char buffer[1024]; - if (_dbus_get_install_root(buffer, sizeof(buffer))) - { - strcat(buffer,DBUS_DATADIR); - strcat(buffer,"/dbus-1/services"); - test_session_service_dir_matches[0] = buffer; - } + strcpy(buffer, _dbus_windows_get_datadir ()); + strcat(buffer, "/dbus-1/services"); + test_session_service_dir_matches[0] = buffer; #endif /* On Unix we don't actually use this variable, but it's easier to handle the diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index 3b754db..da0abe1 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -1527,7 +1527,7 @@ _dbus_replace_install_prefix (const char *configure_time_path) * @returns relocated DATADIR static string */ -static const char * +const char * _dbus_windows_get_datadir (void) { return _dbus_replace_install_prefix(DBUS_DATADIR); -- 1.8.4.5