diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-27 04:50:41 +0100 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-27 02:34:08 -0500 |
| commit | 22a88cfe99d897dc7d3be7b53b954f6cdfa250c6 (patch) | |
| tree | 1ef48238ea15993d800874bb99444c7de0364411 /data | |
| parent | 7e47a57027e043d4fe908d5f0acb7882d4f9330f (diff) | |
| parent | 490ef3213a09ec2b202e9b511a92ce89f811af66 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/event.c
openbox/event.h
Diffstat (limited to 'data')
| -rw-r--r-- | data/autostart.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/data/autostart.sh b/data/autostart.sh index 53063262..23345049 100644 --- a/data/autostart.sh +++ b/data/autostart.sh @@ -22,10 +22,13 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then fi # Make GTK apps look and behave how they were set up in the gnome config tools -if which /usr/libexec/gnome-settings-daemon >/dev/null; then +if test -x /usr/libexec/gnome-settings-daemon >/dev/null; then /usr/libexec/gnome-settings-daemon & elif which gnome-settings-daemon >/dev/null; then gnome-settings-daemon & +# Make GTK apps look and behave how they were set up in the XFCE config tools +elif which xfce-mcs-manager >/dev/null; then + xfce-mcs-manager n & fi # Preload stuff for KDE apps |