[Fedora-i18n-bugs] [ibus-m17n] Update to 1.3.3-5.
Daiki Ueno
ueno at fedoraproject.org
Thu Sep 29 03:47:29 UTC 2011
commit afc7d4fdb4c9bb7fd2e2ccec0c3f2f097a9f4265
Author: Daiki Ueno <ueno at unixuser.org>
Date: Thu Sep 29 12:47:05 2011 +0900
Update to 1.3.3-5.
ibus-m17n-hide-title-status.patch | 46 +++++++++++++++++++++++++++++++++++++
ibus-m17n.spec | 9 ++++++-
2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/ibus-m17n-hide-title-status.patch b/ibus-m17n-hide-title-status.patch
new file mode 100644
index 0000000..0d52c54
--- /dev/null
+++ b/ibus-m17n-hide-title-status.patch
@@ -0,0 +1,46 @@
+From d4a1cb9c6bd852da73ba6520fc5c14edbe84ec14 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Thu, 29 Sep 2011 10:17:28 +0900
+Subject: [PATCH] Hide status from the panel if status == title.
+
+---
+ src/engine.c | 8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index f23d982..a0dcc70 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -43,6 +43,7 @@ struct _IBusM17NEngineClass {
+ gboolean virtual_keyboard_enabled;
+ gboolean use_iok;
+
++ gchar *title;
+ MInputMethod *im;
+ };
+
+@@ -256,6 +257,10 @@ ibus_m17n_engine_class_init (IBusM17NEngineClass *klass)
+ }
+ engine_name = g_strdup_printf ("m17n:%s:%s", lang, name);
+ klass->config_section = g_strdup_printf ("engine/M17N/%s/%s", lang, name);
++ MPlist *l = minput_get_title_icon (msymbol (lang), msymbol (name));
++ if (l && mplist_key (l) == Mtext) {
++ klass->title = ibus_m17n_mtext_to_utf8 (mplist_value (l));
++ }
+ /* whether to use iok - maybe good to move this to default.xml */
+ klass->use_iok = g_strcmp0 (name, "inscript") == 0 ||
+ g_strcmp0 (name, "inscript2") == 0;
+@@ -994,8 +999,9 @@ ibus_m17n_engine_callback (MInputContext *context,
+ else if (command == Minput_status_draw) {
+ gchar *status;
+ status = ibus_m17n_mtext_to_utf8 (m17n->context->status);
++ IBusM17NEngineClass *klass = (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n);
+
+- if (status && strlen (status)) {
++ if (status && strlen (status) && g_strcmp0 (status, klass->title)) {
+ IBusText *text;
+ text = ibus_text_new_from_string (status);
+ ibus_property_set_label (m17n->status_prop, text);
+--
+1.7.6.4
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index b32b63d..941a8ff 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -23,7 +23,7 @@
Name: ibus-m17n
Version: 1.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
@@ -37,6 +37,7 @@ Patch3: ibus-m17n-xkb-options.patch
Patch4: ibus-m17n-xx-icon-symbol.patch
Patch5: ibus-m17n-virtkbd.patch
Patch6: ibus-m17n-iok.patch
+Patch7: ibus-m17n-hide-title-status.patch
# The following BR is for autogen and not necessary when packging
# released tarballs.
@@ -74,6 +75,7 @@ sed -i 's!^[-+][-+][-+] .*/m4/\.gitignore!#\0!' %PATCH4
%patch4 -p1 -b .xx-icon-symbol
%patch5 -p1 -b .virtkbd
%patch6 -p1 -b .iok
+%patch7 -p1 -b .hide-title-status
NOCONFIGURE=1 ./autogen.sh
%build
@@ -95,6 +97,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install
%{_datadir}/ibus/component/*
%changelog
+* Thu Sep 29 2011 Daiki Ueno <dueno at redhat.com> - 1.3.3-5
+- Add ibus-m17n-hide-title-status.patch.
+- Fix bug 741157 - ibus-m17n: m17n "title" variable appears as a
+ dormant button on the language panel
+
* Fri Sep 16 2011 Daiki Ueno <dueno at redhat.com> - 1.3.3-4
- Fix Indic IME symbols (thanks to pravins).
More information about the i18n-bugs
mailing list