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

Update ibus-1.4 patch.

Browse Source
This commit is contained in:
Daiki Ueno 2010-12-10 16:05:05 +09:00
parent 88f6916fdb
commit 4fafe08583
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ibus-m17n-ibus-1.4.patch
View File

@ -1,14 +1,14 @@
From 0399c80ffa111c5b16943242b817063d0e64b2fe Mon Sep 17 00:00:00 2001 From c7acc11b3a8e72efb2479b3d1a6f20abb156994c Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org> From: Daiki Ueno <ueno@unixuser.org>
Date: Fri, 3 Dec 2010 17:05:45 +0900 Date: Fri, 3 Dec 2010 17:05:45 +0900
Subject: [PATCH] Fix problem with ibus-1.4 Subject: [PATCH] Fix problem with ibus-1.4
--- ---
src/engine.c | 58 +++++++++++++++++++++++-------------------------- src/engine.c | 58 +++++++++++++++++++++++--------------------------
src/m17nutil.c | 27 ++++++++++------------- src/m17nutil.c | 18 +++++++-------
src/main.c | 7 +++-- src/main.c | 7 +++--
src/setup.c | 65 ++++++++++++++++++++++++++++--------------------------- src/setup.c | 65 ++++++++++++++++++++++++++++---------------------------
4 files changed, 76 insertions(+), 81 deletions(-) 4 files changed, 73 insertions(+), 75 deletions(-)
diff --git a/src/engine.c b/src/engine.c diff --git a/src/engine.c b/src/engine.c
index f8e7fe5..5fbe46f 100644 index f8e7fe5..5fbe46f 100644
@ -131,22 +131,13 @@ index f8e7fe5..5fbe46f 100644
} }
} }
diff --git a/src/m17nutil.c b/src/m17nutil.c diff --git a/src/m17nutil.c b/src/m17nutil.c
index 7bc4ea5..8fac1fe 100644 index 6d6961f..c4098c7 100644
--- a/src/m17nutil.c --- a/src/m17nutil.c
+++ b/src/m17nutil.c +++ b/src/m17nutil.c
@@ -109,6 +109,7 @@ ibus_m17n_engine_new (MSymbol lang, @@ -113,15 +113,15 @@ ibus_m17n_engine_new (MSymbol lang,
gchar *engine_title;
gchar *engine_icon;
gchar *engine_desc;
+ IBusM17NEngineConfig *config;
engine_name = g_strdup_printf ("m17n:%s:%s", msymbol_name (lang), msymbol_name (name));
@@ -116,17 +117,17 @@ ibus_m17n_engine_new (MSymbol lang,
engine_title = ibus_m17n_mtext_to_utf8 (title);
engine_icon = ibus_m17n_mtext_to_utf8 (icon); engine_icon = ibus_m17n_mtext_to_utf8 (icon);
engine_desc = ibus_m17n_mtext_to_utf8 (desc); engine_desc = ibus_m17n_mtext_to_utf8 (desc);
-
- engine = ibus_engine_desc_new (engine_name, - engine = ibus_engine_desc_new (engine_name,
- engine_longname, - engine_longname,
- engine_desc ? engine_desc : "", - engine_desc ? engine_desc : "",
@ -155,10 +146,7 @@ index 7bc4ea5..8fac1fe 100644
- "", - "",
- engine_icon ? engine_icon : "", - engine_icon ? engine_icon : "",
- "us"); - "us");
- /* set default rank to 0 */ - engine->rank = config->rank;
- engine->rank = 0;
+ config = ibus_m17n_get_engine_config (engine_name);
+
+ engine = ibus_engine_desc_new_varargs ("name", engine_name, + engine = ibus_engine_desc_new_varargs ("name", engine_name,
+ "longname", engine_longname, + "longname", engine_longname,
+ "description", engine_desc ? engine_desc : "", + "description", engine_desc ? engine_desc : "",
@ -171,17 +159,6 @@ index 7bc4ea5..8fac1fe 100644
g_free (engine_name); g_free (engine_name);
g_free (engine_longname); g_free (engine_longname);
@@ -315,10 +316,6 @@ ibus_m17n_get_component (void)
for (p = engines; p != NULL; p = p->next) {
IBusEngineDesc *engine = p->data;
- IBusM17NEngineConfig *config;
-
- config = ibus_m17n_get_engine_config (engine->name);
- engine->rank = config->rank;
ibus_component_add_engine (component, engine);
}
diff --git a/src/main.c b/src/main.c diff --git a/src/main.c b/src/main.c
index e76898d..bba31e1 100644 index e76898d..bba31e1 100644
--- a/src/main.c --- a/src/main.c