diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-09 14:06:54 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-09 14:06:54 +0100 |
| commit | 3212c450bbb16199e02c3470fccf593727c567e7 (patch) | |
| tree | c315e83117eb63477fd1fffb7867fdab8a4928ac /tools/dbus-launch.c | |
| parent | bf7c65f5218d07734bcc7be373ebc33278806824 (diff) | |
| parent | 79aafc193176253454dd455a4cfc45a1a2e36c00 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
Diffstat (limited to 'tools/dbus-launch.c')
| -rw-r--r-- | tools/dbus-launch.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index 11b6e6a4..80d885f4 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -324,17 +324,16 @@ print_variables (const char *bus_address, pid_t bus_pid, long bus_wid, printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s';\n", bus_address); printf ("set DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid); if (bus_wid) - printf ("set DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid); + printf ("set DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid); fflush (stdout); } else if (bourne_shell_syntax) { printf ("DBUS_SESSION_BUS_ADDRESS='%s';\n", bus_address); - if (bourne_shell_syntax) - printf ("export DBUS_SESSION_BUS_ADDRESS;\n"); + printf ("export DBUS_SESSION_BUS_ADDRESS;\n"); printf ("DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid); if (bus_wid) - printf ("DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid); + printf ("DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid); fflush (stdout); } else |