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

diff --git a/data/autostart.sh b/data/autostart.sh
index 962cae071a739a571c827dd6629ad47131107d19..b0f421da24289eef8ab030a0638c7a690db17c57 100644 (file)
--- 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 c466f17de26f908b975dab24a968d6ea88ca5f57..b3f1c0574b8742883b0ce6d1b28714df69538390 100644 (file)
--- 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