rpms/scim/devel initial-locale-hotkey-186861.patch, 1.5, 1.6 scim.spec, 1.88, 1.89

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	initial-locale-hotkey-186861.patch scim.spec 
Log Message:
- fix initial-locale-hotkey-186861.patch to read system default correctly
  (reported by Eugene Teo, #241629)


initial-locale-hotkey-186861.patch:

Index: initial-locale-hotkey-186861.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/initial-locale-hotkey-186861.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- initial-locale-hotkey-186861.patch	1 May 2007 02:42:35 -0000	1.5
+++ initial-locale-hotkey-186861.patch	29 May 2007 09:08:27 -0000	1.6
@@ -1,23 +1,25 @@
---- 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,
+--- scim-1.4.6/src/scim_hotkey.cpp.8-hotkey~	2005-06-18 23:19:35.000000000 +1000
++++ scim-1.4.6/src/scim_hotkey.cpp	2007-05-29 18:38:42.000000000 +1000
+@@ -326,18 +326,6 @@ static char *__scim_frontend_hotkey_conf
+     0
+ };
+ 
+-static char *__scim_frontend_hotkey_defaults [] =
+-{
+-    0,
 -    "Control+space",
-     "",
-     "",
+-    "",
+-    "",
 -    "Control+Alt+Down,Control+Shift+Shift_L+KeyRelease,Control+Shift+Shift_R+KeyRelease",
 -    "Control+Alt+Up,Control+Shift+Control_L+KeyRelease,Control+Shift+Control_R+KeyRelease",
 -    "Control+Alt+Right",
-+    "",
-+    "",
-+    "",
-+    "",
-     0
- };
- 
-@@ -362,11 +362,26 @@
+-    0
+-};
+-
+ class FrontEndHotkeyMatcher::FrontEndHotkeyMatcherImpl
+ {
+ public:    
+@@ -362,11 +350,28 @@ FrontEndHotkeyMatcher::load_hotkeys (con
      if (config.null () || !config->valid ()) return;
  
      KeyEventList keys;
@@ -34,13 +36,15 @@
 -        if (scim_string_to_key_list (keys, config->read (String (__scim_frontend_hotkey_config_paths [i]), String (__scim_frontend_hotkey_defaults [i]))))
 -            m_impl->m_matcher.add_hotkeys (keys, i);
 +        if (userconf_exist == false ) {
-+            String config_paths = String (__scim_frontend_hotkey_config_paths [i]) + "/" + lang;
-+            if (scim_string_to_key_list (keys, config->read (config_paths, String (__scim_frontend_hotkey_defaults [i]))))
++            String config_path = String (__scim_frontend_hotkey_config_paths [i]) + "/" + lang;
++            if (scim_string_to_key_list (keys, config->read (config_path, String (""))))
++                m_impl->m_matcher.add_hotkeys (keys, i);
++	    else {
++	      if (scim_string_to_key_list (keys, config->read (String (__scim_frontend_hotkey_config_paths [i]), String (""))))
 +                m_impl->m_matcher.add_hotkeys (keys, i);
-+            config->write (String (__scim_frontend_hotkey_config_paths [i]), 
-+                    config->read (config_paths, String (__scim_frontend_hotkey_defaults [i])));
++	    }
 +        } else {
-+            if (scim_string_to_key_list (keys, config->read (String (__scim_frontend_hotkey_config_paths [i]), String (__scim_frontend_hotkey_defaults [i]))))
++            if (scim_string_to_key_list (keys, config->read (String (__scim_frontend_hotkey_config_paths [i]), String (""))))
 +                m_impl->m_matcher.add_hotkeys (keys, i);
 +        }
      }


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- scim.spec	21 May 2007 02:41:31 -0000	1.88
+++ scim.spec	29 May 2007 09:08:27 -0000	1.89
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -238,6 +238,10 @@
 
 
 %changelog
+* Tue May 29 2007 Jens Petersen <petersen at redhat.com> - 1.4.6-2
+- fix initial-locale-hotkey-186861.patch to read system default correctly
+  (reported by Eugene Teo, #241629)
+
 * Mon May 21 2007 Jens Petersen <petersen at redhat.com> - 1.4.6-1
 - update to 1.4.6 release
   - scim_panel-observe-workarea-xprop-204442.patch and