[PC-BSD Commits] r20246 - in pcbsd/branches/9.1/overlays/desktop-overlay/usr: local/share/pcbsd/xstartup share/skel

[svn at pcbsd.org]

Author: kris
Date: 2012-11-19 16:42:22 +0000 (Mon, 19 Nov 2012)
New Revision: 20246

Modified:
   pcbsd/branches/9.1/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh
   pcbsd/branches/9.1/overlays/desktop-overlay/usr/share/skel/.xprofile
Log:

MFC fixes to iBus

Submitted by: Yamashiro, Jun	


Modified: pcbsd/branches/9.1/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh
===================================================================
--- pcbsd/branches/9.1/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh	2012-11-19 16:41:56 UTC (rev 20245)
+++ pcbsd/branches/9.1/overlays/desktop-overlay/usr/local/share/pcbsd/xstartup/enable-ibus.sh	2012-11-19 16:42:22 UTC (rev 20246)
@@ -7,20 +7,9 @@
 ##########################################################################
 
 ibus_initialize() {
-  if [ ! -f ${HOME}/.gconf/desktop/ibus/%gconf.xml ]
+  if [ ! -f ${HOME}/.gconf/desktop/ibus/general/%gconf.xml ]
   then
-    mkdir -p ${HOME}/.gconf/desktop/ibus
-    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
+    gconftool-2 --set --type list --list-type=string /desktop/ibus/general/preload_engines "[${1}]"
   fi
 }
 

Modified: pcbsd/branches/9.1/overlays/desktop-overlay/usr/share/skel/.xprofile
===================================================================
--- pcbsd/branches/9.1/overlays/desktop-overlay/usr/share/skel/.xprofile	2012-11-19 16:41:56 UTC (rev 20245)
+++ pcbsd/branches/9.1/overlays/desktop-overlay/usr/share/skel/.xprofile	2012-11-19 16:42:22 UTC (rev 20246)
@@ -10,7 +10,14 @@
 # Check for any specific PC-BSD apps we need to start at login
 for i in `ls /usr/local/share/pcbsd/xstartup/*`
 do
-	# Run Each task in the background to run in parallel
-	if [ -x "${i}" ] ; then (. ${i}) & 
+	# Run some task in the background to run in parallel
+	if [ $i = "/usr/local/share/pcbsd/xstartup/enable-ibus.sh" ] ; then
+		# Cannot work "VARIABLE=value ; export VARIABLE" in the
+		# fork(2)ed script.
+		if [ -x "${i}" ] ; then . ${i}
+		fi
+	else
+		if [ -x "${i}" ] ; then (. ${i}) & 
+		fi
 	fi
 done