X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=blobdiff_plain;f=data%2Fautostart.sh;h=233450491d69c35c542743883d8218d1842bd8b6;hp=b0f421da24289eef8ab030a0638c7a690db17c57;hb=120bab667f22b211f90ce105eba123a8b5e3f7f1;hpb=b11d260dbed6faa93eb6c0393e0b284231e4055e

diff --git a/data/autostart.sh b/data/autostart.sh
index b0f421d..2334504 100644
--- 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,8 +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 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
@@ -30,10 +36,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