rpms/scim/devel scim-1.4.7-fix-capslock.patch, NONE, 1.1 scim.spec, 1.107, 1.108

[Huang Peng (phuang)]

Author: phuang

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

Modified Files:
	scim.spec 
Added Files:
	scim-1.4.7-fix-capslock.patch 
Log Message:
Fix capslock problem with hotkeys. #431222.


scim-1.4.7-fix-capslock.patch:

--- NEW FILE scim-1.4.7-fix-capslock.patch ---
diff -up scim-1.4.7/utils/scimkeyselection.cpp.fix-capslock scim-1.4.7/utils/scimkeyselection.cpp
--- scim-1.4.7/utils/scimkeyselection.cpp.fix-capslock	2008-03-03 18:12:51.000000000 +0800
+++ scim-1.4.7/utils/scimkeyselection.cpp	2008-03-03 18:18:10.000000000 +0800
@@ -267,6 +267,11 @@ scim_key_selection_init (ScimKeySelectio
     gtk_widget_show (keyselection->toggle_hyper);
     gtk_box_pack_start (GTK_BOX (hbox), keyselection->toggle_hyper, TRUE, TRUE, 2);
 
+
+    keyselection->toggle_capslock = gtk_check_button_new_with_mnemonic (_("Ca_psLock")); 
+    gtk_widget_show (keyselection->toggle_capslock);
+    gtk_box_pack_start (GTK_BOX (hbox), keyselection->toggle_capslock, TRUE, TRUE, 2);
+    
     hbox = gtk_hbox_new (TRUE, 0);
     gtk_widget_show (hbox);
     gtk_box_pack_start (GTK_BOX (keyselection), hbox, FALSE, FALSE, 4);
@@ -319,6 +324,8 @@ scim_key_selection_add_key_button_callba
         key += String ("Super+");
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (keyselection->toggle_hyper)))
         key += String ("Hyper+");
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (keyselection->toggle_capslock)))
+        key += String ("CapsLock+");
 
     key_code = String (gtk_entry_get_text (GTK_ENTRY (keyselection->key_code)));
     if (!key_code.length ()){
@@ -572,6 +579,9 @@ scim_key_selection_set_key_event (ScimKe
         GTK_TOGGLE_BUTTON (keyselection->toggle_hyper),
         event.is_hyper_down ());
     gtk_toggle_button_set_active (
+        GTK_TOGGLE_BUTTON (keyselection->toggle_capslock),
+        event.is_caps_lock_down ());
+    gtk_toggle_button_set_active (
         GTK_TOGGLE_BUTTON (keyselection->toggle_release),
         event.is_key_release ());
 


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- scim.spec	3 Mar 2008 08:37:14 -0000	1.107
+++ scim.spec	3 Mar 2008 10:21:33 -0000	1.108
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   13%{?dist}
+Release:   14%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -39,6 +39,7 @@
 Patch18:   scim-1.4.7-ja-sinhala-236715.patch
 Patch19:   scim-1.4.7-remove-locale.patch
 Patch20:   scim-1.4.7-fix-fallback.patch
+Patch21:   scim-1.4.7-fix-capslock.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -158,6 +159,7 @@
 %patch18 -p1 -b .18-sinhala~
 %patch19 -p1 -b .19-remove-locale~
 %patch20 -p1 -b .20-fix-fallback
+%patch21 -p1 -b .20-fix-capslock
 
 %if %{snapshot}
 ./bootstrap
@@ -295,6 +297,9 @@
 
 
 %changelog
+* Mon Mar 3 2008 Huang Peng <phuang at redhat.com> - 1.4.7-14
+- Fix capslock problem #431222.
+
 * Mon Mar 3 2008 Huang Peng <phuang at redhat.com> - 1.4.7-13
 - Fix fallback problem in gtkim module #235147.