diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-12 15:25:15 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-12 15:25:15 +0000 |
| commit | 384c924c77ecb32e5b91d737b8b51cb0e883fd7c (patch) | |
| tree | 1b0c58be8008a9c974828697beb939e5ff878b40 /dbus | |
| parent | 9843c724c6df98d353e6d627e88bdeac2d0f0d87 (diff) | |
| download | dbus-384c924c77ecb32e5b91d737b8b51cb0e883fd7c.tar.gz | |
Revert "Replace $DBUS_USE_TEST_BINARY with $DBUS_TEST_DBUS_LAUNCH"
This reverts commit 8fd2be6013e3d0ff6a6ff63ea022f9606d9a87c6.
This change was intended for 1.11.
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index f0fca85e..50ca60a2 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -3671,7 +3671,7 @@ _dbus_get_autolaunch_address (const char *scope, * but that's done elsewhere, and if it worked, this function wouldn't * be called.) */ const char *display; - const char *progpath; + char *progpath; char *argv[6]; int i; DBusString uuid; @@ -3716,9 +3716,9 @@ _dbus_get_autolaunch_address (const char *scope, } #ifdef DBUS_ENABLE_EMBEDDED_TESTS - progpath = _dbus_getenv ("DBUS_TEST_DBUS_LAUNCH"); - - if (progpath == NULL) + if (_dbus_getenv ("DBUS_USE_TEST_BINARY") != NULL) + progpath = TEST_BUS_LAUNCH_BINARY; + else #endif progpath = DBUS_BINDIR "/dbus-launch"; /* |