rpms/scim/devel scim-1.4.7-fix-capslock.patch, 1.3, 1.4 scim-system-config, 1.6, 1.7 scim.spec, 1.114, 1.115

[Huang Peng (phuang)]

Author: phuang

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

Modified Files:
	scim-system-config scim.spec 
Added Files:
	scim-1.4.7-fix-capslock.patch 
Log Message:
Re-add scim-1.4.7-fix-capslock.patch to fix bug #431222.


scim-1.4.7-fix-capslock.patch:

Index: scim-1.4.7-fix-capslock.patch
===================================================================
RCS file: scim-1.4.7-fix-capslock.patch
diff -N scim-1.4.7-fix-capslock.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ scim-1.4.7-fix-capslock.patch	2 Apr 2008 08:14:17 -0000	1.4
@@ -0,0 +1,45 @@
+diff -up scim-1.4.7/utils/scimkeyselection.h.fix-capslock scim-1.4.7/utils/scimkeyselection.h
+--- scim-1.4.7/utils/scimkeyselection.h.fix-capslock	2008-03-03 18:33:40.000000000 +0800
++++ scim-1.4.7/utils/scimkeyselection.h	2008-03-03 18:15:16.000000000 +0800
+@@ -36,6 +36,7 @@ struct _ScimKeySelection
+     GtkWidget *toggle_meta;
+     GtkWidget *toggle_super;
+     GtkWidget *toggle_hyper;
++    GtkWidget *toggle_capslock;
+     GtkWidget *toggle_release;
+     GtkWidget *key_code;
+ 
+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-system-config
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim-system-config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-system-config	20 Mar 2008 07:04:55 -0000	1.6
+++ scim-system-config	2 Apr 2008 08:14:17 -0000	1.7
@@ -48,7 +48,7 @@
 /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+Meta+Super+Hyper
+/Hotkeys/FrontEnd/ValidKeyMask = Shift+Control+Alt+Meta+Super+Hyper+CapsLock
 /Panel/Gtk/Color/ActiveBackground = light sky blue
 /Panel/Gtk/Color/ActiveText = black
 /Panel/Gtk/Color/NormalBackground = #F7F3F7


Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- scim.spec	20 Mar 2008 07:26:47 -0000	1.114
+++ scim.spec	2 Apr 2008 08:14:17 -0000	1.115
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   20%{?dist}
+Release:   21%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -40,7 +40,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
+Patch21:   scim-1.4.7-fix-capslock.patch
 Patch22:   scim-1.4.7-fix-gdm.patch
 Patch23:   scim-1.4.7-remove-help-frame.patch
 
@@ -160,6 +160,7 @@
 %patch18 -p1 -b .18-sinhala~
 %patch19 -p1 -b .19-remove-locale~
 %patch20 -p1 -b .20-fix-fallback
+%patch21 -p1 -b .21-fix-capslock
 %patch22 -p1 -b .22-fix-gdm
 %patch23 -p1 -b .23-help-frame
 
@@ -301,6 +302,10 @@
 
 
 %changelog
+* Wed Apr 02 2008 Huang Peng <phuang at redhat.com> - 1.4.7-21
+- Update scim.conf to check qtimm in qt4 folder for qtimm.
+- Re-add scim-1.4.7-fix-capslock.patch to fix bug #431222.
+
 * Thu Mar 20 2008 Huang Peng <phuang at redhat.com> - 1.4.7-20
 - Replase scim-system-config.patch with scim-system-global.