From 4e82deacd8c5f9a51210f4e6a91b313eda370ddb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 3 Feb 2005 20:49:33 +0000 Subject: [PATCH] Use the wide character version of ImmGetCompositionString() here, too. 2005-02-03 Tor Lillqvist * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the wide character version of ImmGetCompositionString() here, too. (#165278, Takuro Ashie) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ modules/input/gtkimcontextime.c | 4 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 754e86e313..e89f150c2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-03 Tor Lillqvist + + * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the + wide character version of ImmGetCompositionString() here, + too. (#165278, Takuro Ashie) + 2005-02-03 Mark McLoughlin * gtk/gtkicontheme.c: (load_themes): remove debug spew. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 754e86e313..e89f150c2f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-02-03 Tor Lillqvist + + * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the + wide character version of ImmGetCompositionString() here, + too. (#165278, Takuro Ashie) + 2005-02-03 Mark McLoughlin * gtk/gtkicontheme.c: (load_themes): remove debug spew. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 754e86e313..e89f150c2f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-02-03 Tor Lillqvist + + * modules/input/gtkimcontextime.c (get_pango_attr_list): Use the + wide character version of ImmGetCompositionString() here, + too. (#165278, Takuro Ashie) + 2005-02-03 Mark McLoughlin * gtk/gtkicontheme.c: (load_themes): remove debug spew. diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c index 833cf160b5..615e6a1f60 100644 --- a/modules/input/gtkimcontextime.c +++ b/modules/input/gtkimcontextime.c @@ -446,9 +446,9 @@ get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str) /* * get attributes list of IME. */ - len = ImmGetCompositionStringA (himc, GCS_COMPATTR, NULL, 0); + len = ImmGetCompositionStringW (himc, GCS_COMPATTR, NULL, 0); buf = g_alloca (len); - ImmGetCompositionStringA (himc, GCS_COMPATTR, buf, len); + ImmGetCompositionStringW (himc, GCS_COMPATTR, buf, len); /* * schr and echr are pointer in utf8str.