[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/scim/F-7 initial-locale-hotkey-186861.patch, 1.6, 1.7 scim.spec, 1.88, 1.89



Author: petersen

Update of /cvs/extras/rpms/scim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18654

Modified Files:
	initial-locale-hotkey-186861.patch scim.spec 
Log Message:
save the hotkey for lang in initial-locale-hotkey-186861.patch correctly again


initial-locale-hotkey-186861.patch:

Index: initial-locale-hotkey-186861.patch
===================================================================
RCS file: /cvs/extras/rpms/scim/F-7/initial-locale-hotkey-186861.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- initial-locale-hotkey-186861.patch	30 May 2007 04:18:54 -0000	1.6
+++ initial-locale-hotkey-186861.patch	31 May 2007 08:05:39 -0000	1.7
@@ -1,5 +1,5 @@
 --- 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
++++ scim-1.4.6/src/scim_hotkey.cpp	2007-05-30 17:30:01.000000000 +1000
 @@ -326,18 +326,6 @@ static char *__scim_frontend_hotkey_conf
      0
  };
@@ -19,7 +19,7 @@
  class FrontEndHotkeyMatcher::FrontEndHotkeyMatcherImpl
  {
  public:    
-@@ -362,11 +350,28 @@ FrontEndHotkeyMatcher::load_hotkeys (con
+@@ -362,11 +350,31 @@ FrontEndHotkeyMatcher::load_hotkeys (con
      if (config.null () || !config->valid ()) return;
  
      KeyEventList keys;
@@ -27,7 +27,7 @@
 +    String userconf = scim_get_user_data_dir () + String (SCIM_PATH_DELIM_STRING) + String ("config");
 +    bool userconf_exist = true;
 +
-+    //If this is the first time to run scim on a machine.
++    // If this is the first time to run scim on a machine.
 +    if (access (userconf.c_str (), R_OK) !=0)
 +        userconf_exist = false;
  
@@ -37,12 +37,15 @@
 -            m_impl->m_matcher.add_hotkeys (keys, i);
 +        if (userconf_exist == false ) {
 +            String config_path = String (__scim_frontend_hotkey_config_paths [i]) + "/" + lang;
-+            if (scim_string_to_key_list (keys, config->read (config_path, String (""))))
++            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);
-+	    }
++                // save hotkey for lang in hotkey config
++                config->write (String (__scim_frontend_hotkey_config_paths [i]), 
++                               config->read (config_path, String ("")));
++            } 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);
++            }
 +        } 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);


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/F-7/scim.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- scim.spec	30 May 2007 04:18:54 -0000	1.88
+++ scim.spec	31 May 2007 08:05:39 -0000	1.89
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   19%{?dist}
+Release:   20%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -242,6 +242,9 @@
 
 
 %changelog
+* Thu May 31 2007 Jens Petersen <petersen redhat com> - 1.4.5-20.fc7
+- save the hotkey for lang in initial-locale-hotkey-186861.patch correctly again
+
 * Wed May 30 2007 Jens Petersen <petersen redhat com> - 1.4.5-19.fc7
 - fix initial-locale-hotkey-186861.patch to read system default correctly
   (reported by Eugene Teo, #241629)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]