summaryrefslogtreecommitdiffstats
path: root/bus
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-08-10 20:09:43 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-08-10 20:09:43 +0000
commit2974c82428b5d9d3e1f504ba4052aec47fc2b415 (patch)
tree66973e6b07b52fcd01add8cdfb4c6e1bdac5fae0 /bus
parent5628ef82de9e853381ab61bab8c3cd3b1b622290 (diff)
* dbus/dbus-sysdeps.c:
* dbus/dbus-address.c: * bus/activation.c: * test/shell-test.c: don't hardcode tmp directory (patch from Dave Meikle <dmk at davemeikle dot co dot uk>)
Diffstat (limited to 'bus')
-rw-r--r--bus/activation.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/bus/activation.c b/bus/activation.c
index 3d169017..7b7afe8a 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -33,6 +33,7 @@
#include <dbus/dbus-shell.h>
#include <dbus/dbus-spawn.h>
#include <dbus/dbus-timeout.h>
+#include <dbus/dbus-sysdeps.h>
#include <dirent.h>
#include <errno.h>
@@ -1918,8 +1919,11 @@ bus_activation_service_reload_test (const DBusString *test_data_dir)
if (!_dbus_string_init (&directory))
return FALSE;
-
- if (!_dbus_string_append (&directory, "/tmp/dbus-reload-test-") ||
+
+ if (!_dbus_string_append (&directory, _dbus_get_tmpdir()))
+ return FALSE;
+
+ if (!_dbus_string_append (&directory, "/dbus-reload-test-") ||
!_dbus_generate_random_ascii (&directory, 6))
{
return FALSE;