Update to 1.4.1-4.

This commit is contained in:
Daiki Ueno 2012-06-08 17:56:42 +09:00
parent 6b337f43c0
commit 10d82084ea
3 changed files with 12 additions and 27 deletions

View File

@ -206,7 +206,7 @@ Index: ibus-hangul-1.4.1/setup/main.py
def __write(self, name, v):
return self.__config.set_value("engine/Hangul", name, v)
@@ -194,12 +201,13 @@ if __name__ == "__main__":
@@ -194,14 +201,13 @@ if __name__ == "__main__":
locale.bindtextdomain(config.gettext_package, config.localedir)
locale.bind_textdomain_codeset(config.gettext_package, "UTF-8")
@ -225,3 +225,5 @@ Index: ibus-hangul-1.4.1/setup/main.py
message_format = message)
dialog.run()
sys.exit(1)
-
- Setup(bus).run()

View File

@ -1,21 +0,0 @@
Index: ibus-hangul-1.4.1/setup/main.py
===================================================================
--- ibus-hangul-1.4.1.orig/setup/main.py
+++ ibus-hangul-1.4.1/setup/main.py
@@ -35,7 +35,6 @@ class Setup ():
def __init__ (self, bus):
self.__bus = bus
self.__config = self.__bus.get_config()
- self.__config.connect("value-changed", self.on_value_changed, None)
ui_file = os.path.join(os.path.dirname(__file__), "setup.ui")
self.__builder = Gtk.Builder()
@@ -117,6 +116,8 @@ class Setup ():
ok_button = self.__builder.get_object("button_cancel")
ok_button.grab_focus()
+ self.__config.connect("value-changed", self.on_value_changed, None)
+
def run(self):
res = self.__window.run()
if (res == Gtk.ResponseType.OK):

View File

@ -14,7 +14,7 @@
Name: ibus-hangul
Version: 1.4.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: The Hangul engine for IBus input platform
License: GPLv2+
Group: System Environment/Libraries
@ -25,7 +25,6 @@ Patch1: ibus-hangul-setup-gi.patch
%if %have_bridge_hotkey
Patch2: ibus-hangul-add-hangul-hotkey.patch
%endif
Patch3: ibus-hangul-setup-race-condition.patch
BuildRequires: gettext-devel
BuildRequires: intltool
@ -54,8 +53,6 @@ libhangul.
%patch2 -p1 -b .add-hangul-hotkey
%endif
%patch3 -p1 -b .setup-race-condition
%build
autoreconf
%configure --disable-static %{?_with_hotkeys}
@ -93,8 +90,15 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Fri Jun 8 2012 Daiki Ueno <dueno@redhat.com> - 1.4.1-4
- Fix ibus-hangul-setup-gi.patch
- Remove previously applied ibus-hangul-setup-race-condition.patch
- Fix bug 828597 - [abrt] ibus-hangul-1.4.1-2.fc16:
main.py:184:on_value_changed:TypeError: 'NoneType' object is not
iterable
* Wed Jun 6 2012 Daiki Ueno <dueno@redhat.com> - 1.4.1-3
- fix ibus-setup-hangul race condition
- Fix ibus-setup-hangul race condition
- Fix bug 828597 - [abrt] ibus-hangul-1.4.1-2.fc16:
main.py:184:on_value_changed:TypeError: 'NoneType' object is not
iterable