rpms/scim/devel initial-locale-hotkey-186861.patch, 1.2, 1.3 scim.spec, 1.82, 1.83

[fedora-cvs-commits at redhat.com]

Author: petersen

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7348

Modified Files:
	initial-locale-hotkey-186861.patch scim.spec 
Log Message:
- update initial-locale-hotkey-186861.patch to really turn off the Ctrl-Space
  hotkey by default for non-Asian users (#235435)


initial-locale-hotkey-186861.patch:
 scim_hotkey.cpp |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

Index: initial-locale-hotkey-186861.patch
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/initial-locale-hotkey-186861.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- initial-locale-hotkey-186861.patch	15 Dec 2006 08:36:36 -0000	1.2
+++ initial-locale-hotkey-186861.patch	17 Apr 2007 01:30:49 -0000	1.3
@@ -1,7 +1,10 @@
---- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey	2005-06-18 23:19:35.000000000 +1000
-+++ scim-1.4.5/src/scim_hotkey.cpp	2006-12-12 16:22:59.000000000 +1000
-@@ -332,9 +332,9 @@
-     "Control+space",
+--- scim-1.4.5/src/scim_hotkey.cpp.8-hotkey~	2005-06-18 23:19:35.000000000 +1000
++++ scim-1.4.5/src/scim_hotkey.cpp	2007-04-17 10:15:41.000000000 +1000
+@@ -329,12 +329,12 @@
+ static char *__scim_frontend_hotkey_defaults [] =
+ {
+     0,
+-    "Control+space",
      "",
      "",
 -    "Control+Alt+Down,Control+Shift+Shift_L+KeyRelease,Control+Shift+Shift_R+KeyRelease",
@@ -10,6 +13,7 @@
 +    "",
 +    "",
 +    "",
++    "",
      0
  };
  


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- scim.spec	11 Apr 2007 08:18:47 -0000	1.82
+++ scim.spec	17 Apr 2007 01:30:49 -0000	1.83
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   13%{?dist}
+Release:   14%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -254,6 +254,10 @@
 
 
 %changelog
+* Tue Apr 17 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-14
+- update initial-locale-hotkey-186861.patch to really turn off the Ctrl-Space
+  hotkey by default for non-Asian users (#235435)
+
 * Wed Apr 11 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-13
 - do not set a hotkey by default for non-Asian users (#235435)
 - move the scim system config file from scim-system-default-config.patch