Update to 1.4.0-2.

This commit is contained in:
Daiki Ueno 2012-01-31 16:15:06 +09:00
parent 476e880925
commit ba1436091c
2 changed files with 51 additions and 1 deletions

View File

@ -0,0 +1,44 @@
From 64d68d37f61be45b187ef9de7855b423052cec96 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 26 Jan 2012 11:24:13 +0900
Subject: [PATCH] Don't abort ibus-setup-hangul with exception when
ibus-daemon is not running.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=784377
---
setup/main.py | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/setup/main.py b/setup/main.py
index 9dd0238..068c048 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -32,8 +32,8 @@ from keycapturedialog import KeyCaptureDialog
_ = lambda a : gettext.dgettext(config.gettext_package, a)
class Setup ():
- def __init__ (self):
- self.__bus = ibus.Bus()
+ def __init__ (self, bus):
+ self.__bus = bus
self.__config = self.__bus.get_config()
self.__config.connect("value-changed", self.on_value_changed, None)
@@ -194,4 +194,13 @@ if __name__ == "__main__":
locale.bindtextdomain(config.gettext_package, config.localedir)
locale.bind_textdomain_codeset(config.gettext_package, "UTF-8")
- Setup().run()
+ try:
+ bus = ibus.Bus()
+ except:
+ message = _("IBus daemon is not started")
+ dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR,
+ buttons = gtk.BUTTONS_CLOSE,
+ message_format = message)
+ dialog.run()
+ sys.exit(1)
+ Setup(bus).run()
--
1.7.7.6

View File

@ -12,7 +12,7 @@
Name: ibus-hangul
Version: 1.4.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Hangul engine for IBus input platform
License: GPLv2+
Group: System Environment/Libraries
@ -21,6 +21,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
# dummy source to keep quilt series file
Source1: series
Patch1: ibus-hangul-xx-icon-symbol.patch
Patch2: ibus-hangul-no-ibus-daemon.patch
BuildRequires: gettext-devel
BuildRequires: intltool
@ -43,6 +44,7 @@ libhangul.
%prep
%setup -q
%patch1 -p1 -b .icon-symbol
%patch2 -p1 -b .no-ibus-daemon
%build
autoreconf
@ -67,6 +69,10 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangu
%{_datadir}/applications/ibus-setup-hangul.desktop
%changelog
* Tue Jan 31 2012 Daiki Ueno <dueno@redhat.com> - 1.4.0-2
- Add ibus-hangul-no-ibus-daemon.patch.
- Fix bug 784377 - [abrt] ibus-hangul-1.4.0-1.fc16
* Thu Jan 12 2012 Daiki Ueno <dueno@redhat.com> - 1.4.0-1
- Update version to 1.4.0.
- Remove ibus-hangul-ibus-1.4.patch.