diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-15 02:02:40 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-15 02:02:40 +0000 |
| commit | b74cff0302e70d702e958a8205a6f6e2e2858192 (patch) | |
| tree | 2befabba0b24c6d115636f3a1bc335760cc3fb5a /data/xsession | |
| parent | 5d85502e3b12ae2301b28d624d7fa60a66f646bb (diff) | |
changes to the manual pages.
adding openbox-session.
add paths to the xsession .desktop files
Diffstat (limited to 'data/xsession')
| -rw-r--r-- | data/xsession/openbox-gnome.desktop.in (renamed from data/xsession/openbox-gnome.desktop) | 2 | ||||
| -rw-r--r-- | data/xsession/openbox-kde.desktop.in (renamed from data/xsession/openbox-kde.desktop) | 2 | ||||
| -rw-r--r-- | data/xsession/openbox-session.in | 8 | ||||
| -rw-r--r-- | data/xsession/openbox.desktop.in (renamed from data/xsession/openbox.desktop) | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/data/xsession/openbox-gnome.desktop b/data/xsession/openbox-gnome.desktop.in index da15d1f5..19ae82e0 100644 --- a/data/xsession/openbox-gnome.desktop +++ b/data/xsession/openbox-gnome.desktop.in @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=GNOME/Openbox Comment=Use the Openbox window manager inside of the GNOME desktop environment -Exec=openbox-gnome-session +Exec=@bindir@/openbox-gnome-session TryExec=gnome-session Icon=openbox.png Type=XSession diff --git a/data/xsession/openbox-kde.desktop b/data/xsession/openbox-kde.desktop.in index 1244d8d9..ddfc72d7 100644 --- a/data/xsession/openbox-kde.desktop +++ b/data/xsession/openbox-kde.desktop.in @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=KDE/Openbox Comment=Use the Openbox window manager inside of the K Desktop Environment -Exec=openbox-kde-session +Exec=@bindir@/openbox-kde-session TryExec=startkde Icon=openbox.png Type=XSession diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in index e76d3203..c466f17d 100644 --- a/data/xsession/openbox-session.in +++ b/data/xsession/openbox-session.in @@ -1,10 +1,16 @@ #!/bin/sh -AUTOSTART="$HOME/.config/openbox/autostart" +AUTOSTART="$HOME/.config/openbox/autostart.sh" +GLOBALAUTOSTART="@configdir@/openbox/autostart.sh" if test -e $AUTOSTART; then # sleep for 1 second so Openbox is there before anything else (sleep 1 && . $AUTOSTART) & +else + if test -e $GLOBALAUTOSTART; then + # sleep for 1 second so Openbox is there before anything else + (sleep 1 && . $GLOBALAUTOSTART) & + fi fi exec @bindir@/openbox "$@" diff --git a/data/xsession/openbox.desktop b/data/xsession/openbox.desktop.in index b162f09e..f8cb9f36 100644 --- a/data/xsession/openbox.desktop +++ b/data/xsession/openbox.desktop.in @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=Openbox Comment=Log in using the Openbox window manager (without a session manager) -Exec=openbox-session -TryExec=openbox-session +Exec=@bindir@/openbox-session +TryExec=@bidir@/openbox-session Icon=openbox.png Type=XSession |