rpms/ibus-m17n
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.2.99.20100202

Browse Source
This commit is contained in:
Peng Huang 2010-02-02 03:25:05 +00:00
parent 368f8862e0
commit 05d0dbf5f0
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
ibus-m17n-1.2.0.20091217.tar.gz ibus-m17n-1.2.99.20100202.tar.gz

37
ibus-m17n-iok.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/engine.c b/src/engine.c diff --git a/src/engine.c b/src/engine.c
index 8dc5c46..1f602a1 100644 index dcfbe48..057307a 100644
--- a/src/engine.c --- a/src/engine.c
+++ b/src/engine.c +++ b/src/engine.c
@@ -17,6 +17,8 @@ struct _IBusM17NEngine { @@ -17,6 +17,8 @@ struct _IBusM17NEngine {
@ -20,9 +20,9 @@ index 8dc5c46..1f602a1 100644
m17n->status_prop = ibus_property_new ("status", m17n->status_prop = ibus_property_new ("status",
PROP_TYPE_NORMAL, PROP_TYPE_NORMAL,
NULL, NULL,
@@ -144,8 +148,21 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n) @@ -145,9 +149,22 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n)
0,
NULL); NULL);
g_object_ref_sink (m17n->status_prop);
+ text = ibus_text_new_from_string ("iok"); + text = ibus_text_new_from_string ("iok");
+ m17n->show_iok_prop = ibus_property_new ("iok", + m17n->show_iok_prop = ibus_property_new ("iok",
@ -34,15 +34,16 @@ index 8dc5c46..1f602a1 100644
+ FALSE, + FALSE,
+ 0, + 0,
+ NULL); + NULL);
+ g_object_unref (text); + g_object_ref_sink (m17n->show_iok_prop);
+ +
m17n->prop_list = ibus_prop_list_new (); m17n->prop_list = ibus_prop_list_new ();
g_object_ref_sink (m17n->prop_list);
ibus_prop_list_append (m17n->prop_list, m17n->status_prop); ibus_prop_list_append (m17n->prop_list, m17n->status_prop);
+ ibus_prop_list_append (m17n->prop_list, m17n->show_iok_prop); + ibus_prop_list_append (m17n->prop_list, m17n->show_iok_prop);
m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE); m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
m17n->context = NULL; g_object_ref_sink (m17n->table);
@@ -159,6 +176,7 @@ ibus_m17n_engine_constructor (GType type, @@ -162,6 +179,7 @@ ibus_m17n_engine_constructor (GType type,
IBusM17NEngine *m17n; IBusM17NEngine *m17n;
MInputMethod *im; MInputMethod *im;
const gchar *engine_name; const gchar *engine_name;
@ -50,7 +51,7 @@ index 8dc5c46..1f602a1 100644
m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type, m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
n_construct_params, n_construct_params,
@@ -166,6 +184,15 @@ ibus_m17n_engine_constructor (GType type, @@ -169,6 +187,15 @@ ibus_m17n_engine_constructor (GType type,
engine_name = ibus_engine_get_name ((IBusEngine *) m17n); engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
g_assert (engine_name); g_assert (engine_name);
@ -66,7 +67,7 @@ index 8dc5c46..1f602a1 100644
if (im_table == NULL) { if (im_table == NULL) {
im_table = g_hash_table_new_full (g_str_hash, im_table = g_hash_table_new_full (g_str_hash,
@@ -178,12 +205,6 @@ ibus_m17n_engine_constructor (GType type, @@ -181,12 +208,6 @@ ibus_m17n_engine_constructor (GType type,
if (im == NULL) { if (im == NULL) {
gchar *lang; gchar *lang;
gchar *name; gchar *name;
@ -79,7 +80,7 @@ index 8dc5c46..1f602a1 100644
lang = strv[1]; lang = strv[1];
name = strv[2]; name = strv[2];
@@ -208,9 +229,9 @@ ibus_m17n_engine_constructor (GType type, @@ -211,9 +232,9 @@ ibus_m17n_engine_constructor (GType type,
g_hash_table_insert (im_table, g_strdup (engine_name), im); g_hash_table_insert (im_table, g_strdup (engine_name), im);
} }
@ -90,15 +91,19 @@ index 8dc5c46..1f602a1 100644
if (im == NULL) { if (im == NULL) {
g_warning ("Can not find m17n keymap %s", engine_name); g_warning ("Can not find m17n keymap %s", engine_name);
g_object_unref (m17n); g_object_unref (m17n);
@@ -232,6 +253,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n) @@ -240,6 +261,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
m17n->prop_list = NULL; m17n->status_prop = NULL;
} }
+ if (m17n->show_iok_prop) {
+ g_object_unref (m17n->show_iok_prop);
+ m17n->show_iok_prop = NULL;
+ }
+ +
if (m17n->status_prop) { if (m17n->table) {
g_object_unref (m17n->status_prop); g_object_unref (m17n->table);
m17n->status_prop = NULL; m17n->table = NULL;
@@ -384,6 +406,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine) @@ -386,6 +412,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
IBusM17NEngine *m17n = (IBusM17NEngine *) engine; IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
ibus_engine_register_properties (engine, m17n->prop_list); ibus_engine_register_properties (engine, m17n->prop_list);
@ -106,7 +111,7 @@ index 8dc5c46..1f602a1 100644
ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in")); ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
parent_class->focus_in (engine); parent_class->focus_in (engine);
@@ -469,6 +492,20 @@ ibus_m17n_engine_property_activate (IBusEngine *engine, @@ -471,6 +498,20 @@ ibus_m17n_engine_property_activate (IBusEngine *engine,
const gchar *prop_name, const gchar *prop_name,
guint prop_state) guint prop_state)
{ {

8
ibus-m17n.spec
View File

@ -1,7 +1,7 @@
%define require_ibus_version 1.2.0 %define require_ibus_version 1.2.99
Name: ibus-m17n Name: ibus-m17n
Version: 1.2.0.20091217 Version: 1.2.99.20100202
Release: 1%{?dist} Release: 1%{?dist}
Summary: The M17N engine for IBus platform Summary: The M17N engine for IBus platform
License: GPLv2+ License: GPLv2+
@ -52,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ibus/component/* %{_datadir}/ibus/component/*
%changelog %changelog
* Tue Feb 02 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.2.99.20100202-1
- Update to 1.2.99.20100202.
- Update iok patch.
* Thu Dec 17 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20091217-1 * Thu Dec 17 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20091217-1
- Update to 1.2.0.20091217. - Update to 1.2.0.20091217.
- Update iok patch. - Update iok patch.

2
sources
View File

@ -1 +1 @@
9bcccb93c3385bda01172f846b716048 ibus-m17n-1.2.0.20091217.tar.gz e1d306b31fef0182d3f50f984f3737cf ibus-m17n-1.2.99.20100202.tar.gz