[PC-BSD Commits] r19494 - in pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd: . xstartup

[svn at pcbsd.org]

Author: kris
Date: 2012-09-24 18:56:34 +0000 (Mon, 24 Sep 2012)
New Revision: 19494

Removed:
   pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/gconf-xml/
Modified:
   pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh
Log:

* Fix path of %gconf.xml to $HOME/.gconf/desktop/ibus/general/%gconf.xml
* %gconf.xml auto-generate by enable-ibus.sh.

Submitted by: Yamashiro, Jun	


Modified: pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh
===================================================================
--- pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh	2012-09-24 18:53:50 UTC (rev 19493)
+++ pcbsd/current/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh	2012-09-24 18:56:34 UTC (rev 19494)
@@ -2,7 +2,6 @@
 
 # Set this to YES if you want to manually enable ibus
 FORCEIBUS="NO"
-IBUS_GCONF_PATH=/usr/local/share/pcbsd/gconf-xml
 
 # Do not modify below
 ##########################################################################
@@ -11,26 +10,36 @@
   if [ ! -f ${HOME}/.gconf/desktop/ibus/%gconf.xml ]
   then
     mkdir -p ${HOME}/.gconf/desktop/ibus
-    cp ${IBUS_GCONF_PATH}/$1-gconf.xml ${HOME}/.gconf/desktop/ibus/%gconf.xml
+    cat <<EOF > ${HOME}/.gconf/desktop/ibus/general/%gconf.xml
+<?xml version="1.0"?>
+<!-- Auto generated by enable-ibus.sh -->
+<gconf>
+	<entry name="preload_engines" mtime="0" type="list" ltype="string">
+		<li type="string">
+			<stringvalue>$1</stringvalue>
+		</li>
+	</entry>
+</gconf>
+EOF
   fi
 }
 
 # Check if this lang needs ibus
 case ${GDM_LANG} in
   ja_JP*)
-  ibus_initialize "japanese"
+  ibus_initialize "anthy"
   ENABLE="YES"
   ;;
   ko_KR*)
-  ibus_initialize "korean"
+  ibus_initialize "m17n:ko:romaja"
   ENABLE="YES"
   ;;
   zh_CN*)
-  ibus_initialize "chinese-zh_CN"
+  ibus_initialize "pinyin"
   ENABLE="YES"
   ;;
   zh_TW*)
-  ibus_initialize "chinese-zh_TW"
+  ibus_initialize "chewing"
   ENABLE="YES"
   ;;
   *) ENABLE="NO" ;;