From: Dana Jansens <danakj@orodu.net>
Date: Wed, 16 May 2007 19:04:48 +0000 (+0000)
Subject: add SCIM support to the default autostart. make the autostart run before openbox.
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=b11d260dbed6faa93eb6c0393e0b284231e4055e;p=chaz%2Fopenbox

add SCIM support to the default autostart. make the autostart run before openbox.
---

diff --git a/data/autostart.sh b/data/autostart.sh
index 962cae07..b0f421da 100644
--- a/data/autostart.sh
+++ b/data/autostart.sh
@@ -29,3 +29,11 @@ fi
 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 &
+fi
diff --git a/data/xsession/openbox-session.in b/data/xsession/openbox-session.in
index c466f17d..b3f1c057 100644
--- a/data/xsession/openbox-session.in
+++ b/data/xsession/openbox-session.in
@@ -4,12 +4,10 @@ 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) &
+    . $AUTOSTART
 else
     if test -e $GLOBALAUTOSTART; then
-        # sleep for 1 second so Openbox is there before anything else
-        (sleep 1 && . $GLOBALAUTOSTART) &
+        . $GLOBALAUTOSTART
     fi
 fi