Merge branch 'backport' into work

[chaz/openbox] / data / autostart.sh

diff --git a/data/autostart.sh b/data/autostart.sh
index b0f421da24289eef8ab030a0638c7a690db17c57..5306326258b9b087109afbfb8c2037a88eb0905e 100644 (file)
--- a/data/autostart.sh
+++ b/data/autostart.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+# This shell script is run before Openbox launches.
+# Environment variables set here are passed to the Openbox session.
 
 # Set a background color
 BG=""
@@ -21,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
 
@@ -30,10 +33,9 @@ if which start_kdeinit >/dev/null; then
   LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup &
 fi
 
-# Support for SCIM
-if which scim >/dev/null; then
-  export XMODIFIERS=@im=SCIM
-  export GTK_IM_MODULE=scim
-  export QT_IM_MODULE=scim
-  scim -d &
+# Run XDG autostart things.  By default don't run anything desktop-specific
+# See xdg-autostart --help more info
+DESKTOP_ENV=""
+if which xdg-autostart >/dev/null; then
+  xdg-autostart $DESKTOP_ENV
 fi