rpms/scim/devel scim-system-config,1.3,1.4 scim.spec,1.100,1.101

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27289

Modified Files:
	scim-system-config scim.spec 
Log Message:
- change the default Simplied Chinese IME to scim-python Pinyin
- do not set the trigger hotkey for all locale by default
- remove unused ChangeFactoryGlobally key from system config




Index: scim-system-config
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim-system-config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-system-config	22 Jun 2007 01:39:35 -0000	1.3
+++ scim-system-config	21 Jan 2008 08:01:49 -0000	1.4
@@ -1,14 +1,13 @@
 # This file is encoded in UTF-8 encoding.
 /DefaultIMEngineFactory/ta_IN = IMEngine-M17N-ta-tamil99
-# pinyin
-/DefaultIMEngineFactory/zh_CN = 05235cfc-43ce-490c-b1b1-c5a2185276ae
+# scim-python pinyin
+/DefaultIMEngineFactory/zh_CN = 29ab338a-5a27-46b8-96cd-abbe86f17132
 /DefaultIMEngineFactory/zh_SG = 05235cfc-43ce-490c-b1b1-c5a2185276ae
 # CangJie3
 /DefaultIMEngineFactory/zh_HK = 5da9d4ff-ccdd-45af-b1a5-7bd4ac0aeb5f
 # chewing
 /DefaultIMEngineFactory/zh_TW = fcff66b6-4d3e-4cf2-833c-01ef66ac6025
 /FrontEnd/OnTheSpot = true
-/FrontEnd/ChangeFactoryGlobally = false
 /FrontEnd/Socket/ConfigReadOnly = false
 /FrontEnd/Socket/MaxClients = 512
 /FrontEnd/X11/BrokenWchar = true
@@ -26,9 +25,28 @@
 /Hotkeys/FrontEnd/PreviousFactory/zh_SG = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
 /Hotkeys/FrontEnd/PreviousFactory/zh_TW = Control+Alt+Up,Shift+Control+KeyRelease+Control_L,Shift+Control+KeyRelease+Control_R
 /Hotkeys/FrontEnd/ShowFactoryMenu = 
-/Hotkeys/FrontEnd/Trigger = Control+space
+# disable trigger hotkey by default, except for the locale below:
+/Hotkeys/FrontEnd/Trigger = 
+/Hotkeys/FrontEnd/Trigger/as_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/bn_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/gu_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/hi_IN = Control+space
 /Hotkeys/FrontEnd/Trigger/ja_JP = Zenkaku_Hankaku,Alt+grave,Control+space
+/Hotkeys/FrontEnd/Trigger/kn_IN = Control+space
 /Hotkeys/FrontEnd/Trigger/ko_KR = Alt+Alt_L+KeyRelease,Shift+space,Control+space,Hangul
+/Hotkeys/FrontEnd/Trigger/ml_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/mr_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/ne_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/or_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/pa_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/si_LK = Control+space
+/Hotkeys/FrontEnd/Trigger/ta_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/te_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/ur_IN = Control+space
+/Hotkeys/FrontEnd/Trigger/zh_CN = Control+space
+/Hotkeys/FrontEnd/Trigger/zh_HK = Control+space
+/Hotkeys/FrontEnd/Trigger/zh_SG = Control+space
+/Hotkeys/FrontEnd/Trigger/zh_TW = Control+space
 /Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+CapsLock+Meta+Super+Hyper
 /Panel/Gtk/Color/ActiveBackground = light sky blue
 /Panel/Gtk/Color/ActiveText = black


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- scim.spec	19 Oct 2007 07:03:08 -0000	1.100
+++ scim.spec	21 Jan 2008 08:01:49 -0000	1.101
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -291,6 +291,11 @@
 
 
 %changelog
+* Mon Jan 21 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-8
+- change the default Simplied Chinese IME to scim-python Pinyin
+- do not set the trigger hotkey for all locale by default
+- remove unused ChangeFactoryGlobally key from system config
+
 * Fri Oct 19 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-7.fc8
 - quote backquotes in xinput config file (#339271)