diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-09-30 19:38:34 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-09-30 19:38:34 +0000 |
| commit | f6fa010403cb2badd88ce096ae91f664418508d1 (patch) | |
| tree | 67227726b518356870813b33bc346bda9be32e18 /tools/dbus-launch.1 | |
| parent | 5f292c611fc60bf3115dcf3d1213fdedc36fc65c (diff) | |
* configure.in: add DBUS_BINDIR as a #define to C source code.
* tools/dbus-launch.c
* tools/dbus-launch.h
* tools/dbus-launch-x11.c:
* tools/dbus-launch.1: Add the --autolaunch option to
dbus-launch, which makes it scan for an existing session
started with --autolaunch. With that option, it also creates
an X11 window and saves the bus address and PID to it.
* dbus/dbus-sysdeps.h:
* dbus/dbus-sysdeps-unix.c (_dbus_get_autolaunch_address): Add
a function that runs "dbus-launch --autolaunch" to retrieve
the running D-Bus session address (or start one if none was running)
* dbus/dbus-transport.c: Add the handler for the "autolaunch:"
address protocol, which tries to get the running session from
dbus-launch.
* dbus/dbus-bus.c:
* dbus/dbus-internals.h: Make "autolaunch:" be the default
D-Bus session bus address.
* dbus/dbus-connection.c: Fix horrible typo in error message.
Diffstat (limited to 'tools/dbus-launch.1')
| -rw-r--r-- | tools/dbus-launch.1 | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/dbus-launch.1 b/tools/dbus-launch.1 index a3180f69..3c505e7b 100644 --- a/tools/dbus-launch.1 +++ b/tools/dbus-launch.1 @@ -7,7 +7,7 @@ dbus-launch \- Utility to start a message bus from a shell script .SH SYNOPSIS .PP -.B dbus-launch [\-\-version] [\-\-sh-syntax] [\-\-csh-syntax] [\-\-auto-syntax] [\-\-exit-with-session] [\-\-config-file=FILENAME] [PROGRAM] [ARGS...] +.B dbus-launch [\-\-version] [\-\-sh-syntax] [\-\-csh-syntax] [\-\-auto-syntax] [\-\-exit-with-session] [\-\-autolaunch] [\-\-config-file=FILENAME] [PROGRAM] [ARGS...] .SH DESCRIPTION @@ -90,6 +90,13 @@ server. If this process gets a HUP on stdin or loses its X connection, it kills the message bus daemon. .TP +.I "--autolaunch" +This option implies that \fIdbus-launch\fP should scan for a +previously-started session and reuse the values found there. If no +session is found, it will start a new session. The +\-\-exit-with-session option is implied if \-\-autolaunch is given. + +.TP .I "--sh-syntax" Emit Bourne-shell compatible code to set up environment variables. |