diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 10:51:35 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 19:43:02 +0100 |
| commit | 1124d1036984f920dcd5b2caec9ff8fe2d788b8a (patch) | |
| tree | 6e0c626f33ee58e5888ceb4a11608f2103a34d16 /data/autostart.sh | |
| parent | bbf0eed8d146602e81e64e9bc6d1c451c260b52f (diff) | |
| parent | f1f61ff703db72cc1db7f834c9cb45616d55da10 (diff) | |
Merge branch 'backport' into work
Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)
Diffstat (limited to 'data/autostart.sh')
| -rw-r--r-- | data/autostart.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/data/autostart.sh b/data/autostart.sh index ab542841..53063262 100644 --- a/data/autostart.sh +++ b/data/autostart.sh @@ -22,7 +22,9 @@ 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 gnome-settings-daemon >/dev/null; then +if which /usr/libexec/gnome-settings-daemon >/dev/null; then + /usr/libexec/gnome-settings-daemon & +elif which gnome-settings-daemon >/dev/null; then gnome-settings-daemon & fi @@ -34,6 +36,6 @@ fi # Run XDG autostart things. By default don't run anything desktop-specific # See xdg-autostart --help more info DESKTOP_ENV="" -if which xdg-autostart; then +if which xdg-autostart >/dev/null; then xdg-autostart $DESKTOP_ENV fi |