Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt
This commit is contained in:
parent
2bd29c12b7
commit
80c7f4ed96
@ -1 +1,39 @@
|
||||
|
||||
diff --git a/engine/engine.py b/engine/engine.py
|
||||
index 7069b0a..4b93d35 100644
|
||||
--- a/engine/engine.py
|
||||
+++ b/engine/engine.py
|
||||
@@ -952,10 +952,10 @@ class Engine(ibus.EngineBase):
|
||||
@classmethod
|
||||
def CONFIG_VALUE_CHANGED(cls, bus, section, name, value):
|
||||
print 'VALUE_CHAMGED =', section, name, value
|
||||
- section = section[len(cls.__prefs._prefix) + 1:]
|
||||
- if section == cls._get_shortcut_type():
|
||||
+ base_sec = section[len(cls.__prefs._prefix) + 1:]
|
||||
+ sec = cls._get_shortcut_type()
|
||||
+ if base_sec == sec:
|
||||
cmd = '_Engine__cmd_' + name
|
||||
- sec = cls._get_shortcut_type()
|
||||
old = cls.__prefs.get_value(sec, name)
|
||||
value = value if value != [''] else []
|
||||
for s in set(old).difference(value):
|
||||
@@ -968,12 +968,17 @@ class Engine(ibus.EngineBase):
|
||||
lambda a, b: cmp(keys.index(a[13:]), keys.index(b[13:])))
|
||||
|
||||
cls.__prefs.set_value(sec, name, value)
|
||||
- elif section == 'common':
|
||||
- cls.__prefs.set_value(section, name, value)
|
||||
+ elif base_sec == 'common':
|
||||
+ cls.__prefs.set_value(base_sec, name, value)
|
||||
if name == 'shortcut_type':
|
||||
cls.__keybind = cls._mk_keybind()
|
||||
+ elif section == 'panel':
|
||||
+ # This value is used for ibus.config.set_value only.
|
||||
+ pass
|
||||
+ elif base_sec:
|
||||
+ cls.__prefs.set_value(base_sec, name, value)
|
||||
else:
|
||||
- cls.__prefs.set_value(sec, name, value)
|
||||
+ cls.__prefs.set_value(section, name, value)
|
||||
|
||||
@classmethod
|
||||
def _mk_keybind(cls):
|
||||
|
@ -2,13 +2,13 @@
|
||||
%define require_ibus_version 1.2.0.20090904
|
||||
Name: ibus-anthy
|
||||
Version: 1.2.0.20090917
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: The Anthy engine for IBus input platform
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://code.google.com/p/ibus/
|
||||
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
|
||||
# Patch0: ibus-anthy-HEAD.patch
|
||||
Patch0: ibus-anthy-HEAD.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -18,6 +18,7 @@ BuildRequires: python-devel
|
||||
BuildRequires: anthy-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: intltool
|
||||
|
||||
Requires: ibus >= %{require_ibus_version}
|
||||
Requires: anthy
|
||||
@ -29,7 +30,7 @@ libanthy.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# %patch0 -p1
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/ibus/component/*
|
||||
|
||||
%changelog
|
||||
* Fri Oct 23 2009 Takao Fujiwara <takao.fujiwara1@gmail.com> - 1.2.0.20090917-2
|
||||
- Fix bug 526881 - ibus-anthy backtrace is reported by the latest abrt
|
||||
|
||||
* Thu Sep 17 2009 Takao Fujiwara <takao.fujiwara1@gmail.com> - 1.2.0.20090917-1
|
||||
- Update to 1.2.0.20090917
|
||||
- Fix bug 523642 - ibus-anthy convert_to_char_type_{for,back}ward()
|
||||
|
Loading…
Reference in New Issue
Block a user