From 5d417498fa893bf6d4809da9302f63aa93ad7cb4 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Mon, 19 May 2014 12:20:08 +0900 Subject: [PATCH] Updated ibus-anthy-HEAD.patch to fix clear() in input mode. --- ibus-anthy-HEAD.patch | 41 +++++++++++++++++++++++++++++++++++++++++ ibus-anthy.spec | 5 ++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index 9f66c40..4c6f72b 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -2481,3 +2481,44 @@ index fa5f34f..437e94c 100644 -- 1.8.5.3 +From b852cfb6061259e4fd7198e3a2579b4495e15ecd Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Mon, 19 May 2014 12:01:22 +0900 +Subject: [PATCH] Fix None object has clear() in input mode icon. (#1097364) + +--- + engine/python2/engine.py | 3 ++- + engine/python3/engine.py | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/engine/python2/engine.py b/engine/python2/engine.py +index 68a4b48..68e898b 100644 +--- a/engine/python2/engine.py ++++ b/engine/python2/engine.py +@@ -1104,7 +1104,8 @@ class Engine(IBus.EngineSimple): + # It seems do_destroy() is called when launch_engine() is called. + #self.__remove_dict_files() + # It seems super.destroy() does not unref the engine. +- self.__input_mode_icon.clear() ++ if self.__input_mode_icon != None: ++ self.__input_mode_icon.clear() + self.__input_mode_icon = None + + def __join_all_segments(self): +diff --git a/engine/python3/engine.py b/engine/python3/engine.py +index 67370d8..517a64a 100644 +--- a/engine/python3/engine.py ++++ b/engine/python3/engine.py +@@ -1099,7 +1099,8 @@ class Engine(IBus.EngineSimple): + # It seems do_destroy() is called when launch_engine() is called. + #self.__remove_dict_files() + # It seems super.destroy() does not unref the engine. +- self.__input_mode_icon.clear() ++ if self.__input_mode_icon != None: ++ self.__input_mode_icon.clear() + self.__input_mode_icon = None + + def __join_all_segments(self): +-- +1.8.5.3 + diff --git a/ibus-anthy.spec b/ibus-anthy.spec index e398500..7c62a5f 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -14,7 +14,7 @@ Name: ibus-anthy Version: 1.5.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Anthy engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries @@ -157,6 +157,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_libdir}/libanthygobject-%{sub_version}.so %changelog +* Mon May 19 2014 Takao Fujiwara - 1.5.5-4 +- Updated ibus-anthy-HEAD.patch to fix clear() in input mode. + * Mon Apr 21 2014 Takao Fujiwara - 1.5.5-3 - Updated ibus-anthy-HEAD.patch to unref pixbuf on destroy.