rpms/scim/devel initial-locale-hotkey-186861.patch, 1.6, 1.7 scim.spec, 1.89, 1.90
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Wed May 30 07:34:36 UTC 2007
- Previous message (by thread): rpms/perl-Params-Util/FC-5 .cvsignore, 1.18, 1.19 perl-Params-Util.spec, 1.18, 1.19 sources, 1.18, 1.19
- Next message (by thread): rpms/kdelibs/F-7 kdelibs-3.5.7-kde#146105.patch, NONE, 1.1 kdelibs.spec, 1.212, 1.213
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3391
Modified Files:
initial-locale-hotkey-186861.patch scim.spec
Log Message:
save the hotkey for lang in initial-locale-hotkey-186861.patch again
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- initial-locale-hotkey-186861.patch 29 May 2007 09:08:27 -0000 1.6
+++ initial-locale-hotkey-186861.patch 30 May 2007 07:34:30 -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/devel/scim.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- scim.spec 29 May 2007 09:08:27 -0000 1.89
+++ scim.spec 30 May 2007 07:34:30 -0000 1.90
@@ -3,7 +3,7 @@
Name: scim
Version: 1.4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Smart Common Input Method platform
License: LGPL
@@ -238,9 +238,12 @@
%changelog
+* Wed May 30 2007 Jens Petersen <petersen at redhat.com> - 1.4.6-3
+- save the hotkey for lang in initial-locale-hotkey-186861.patch again
+
* 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)
+- fix initial-locale-hotkey-186861.patch to read system hotkey config
+ 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
- Previous message (by thread): rpms/perl-Params-Util/FC-5 .cvsignore, 1.18, 1.19 perl-Params-Util.spec, 1.18, 1.19 sources, 1.18, 1.19
- Next message (by thread): rpms/kdelibs/F-7 kdelibs-3.5.7-kde#146105.patch, NONE, 1.1 kdelibs.spec, 1.212, 1.213
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list