Update to 1.3.1-12.

This commit is contained in:
Daiki Ueno 2010-12-22 18:03:38 +09:00
parent 4fafe08583
commit 1bca90a9e5
2 changed files with 37 additions and 7 deletions

View File

@ -1,17 +1,18 @@
From 6bec9368e23e2637e81b7b6b56b02a88d5f2bbda Mon Sep 17 00:00:00 2001 From e4f14d6d0755dc315c850eaef6f46fd1596b2da7 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org> From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 15 Sep 2010 12:21:35 +0900 Date: Wed, 15 Sep 2010 12:21:35 +0900
Subject: [PATCH] Support surrounding-text commands. Subject: [PATCH] Support surrounding-text commands.
--- ---
src/engine.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- src/engine.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-) src/m17nutil.c | 8 ++++++++
2 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/src/engine.c b/src/engine.c diff --git a/src/engine.c b/src/engine.c
index 260a806..73d6ef2 100644 index 5fbe46f..e5dad3e 100644
--- a/src/engine.c --- a/src/engine.c
+++ b/src/engine.c +++ b/src/engine.c
@@ -812,8 +812,53 @@ ibus_m17n_engine_callback (MInputContext *context, @@ -966,8 +966,53 @@ ibus_m17n_engine_callback (MInputContext *context,
} }
else if (command == Minput_reset) { else if (command == Minput_reset) {
} }
@ -68,6 +69,32 @@ index 260a806..73d6ef2 100644
+ 0, len); + 0, len);
} }
} }
-- diff --git a/src/m17nutil.c b/src/m17nutil.c
1.7.2.3 index 8fac1fe..3865931 100644
--- a/src/m17nutil.c
+++ b/src/m17nutil.c
@@ -96,6 +96,13 @@ ibus_m17n_parse_color (const gchar *hex)
return color;
}
+#define DEFAULT_REQUIRES (IBUS_CAP_PREEDIT_TEXT | \
+ IBUS_CAP_AUXILIARY_TEXT | \
+ IBUS_CAP_LOOKUP_TABLE | \
+ IBUS_CAP_FOCUS | \
+ IBUS_CAP_PROPERTY | \
+ IBUS_CAP_SURROUNDING_TEXT)
+
static IBusEngineDesc *
ibus_m17n_engine_new (MSymbol lang,
MSymbol name,
@@ -127,6 +134,7 @@ ibus_m17n_engine_new (MSymbol lang,
"icon", engine_icon ? engine_icon : "",
"layout", "us",
"rank", config->rank,
+ "requires", DEFAULT_REQUIRES,
NULL);
g_free (engine_name);
--
1.7.3.4

View File

@ -2,7 +2,7 @@
Name: ibus-m17n Name: ibus-m17n
Version: 1.3.1 Version: 1.3.1
Release: 11%{?dist} Release: 12%{?dist}
Summary: The M17N engine for IBus platform Summary: The M17N engine for IBus platform
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/* %{_datadir}/ibus/component/*
%changelog %changelog
* Wed Dec 22 2010 Daiki Ueno <dueno@redhat.com> - 1.3.1-12
- Update surrounding-text patch.
* Fri Dec 10 2010 Daiki Ueno <dueno@redhat.com> - 1.3.1-11 * Fri Dec 10 2010 Daiki Ueno <dueno@redhat.com> - 1.3.1-11
- Update ibus-m17n-HEAD.patch. - Update ibus-m17n-HEAD.patch.
- Lower si-samanala.mim rank per request from a Sinhala user. - Lower si-samanala.mim rank per request from a Sinhala user.