Use the wide character version of ImmGetCompositionString() here, too.

2005-02-03  Tor Lillqvist  <tml@novell.com>

	* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
	wide character version of ImmGetCompositionString() here,
	too. (#165278, Takuro Ashie)
This commit is contained in:
Tor Lillqvist
2005-02-03 20:51:48 +00:00
committed by Tor Lillqvist
parent a03c10fa14
commit 8a5d05e253
4 changed files with 20 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2005-02-03 Tor Lillqvist <tml@novell.com>
* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
wide character version of ImmGetCompositionString() here,
too. (#165278, Takuro Ashie)
2005-02-03 Matthias Clasen <mclasen@redhat.com> 2005-02-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do

View File

@ -1,3 +1,9 @@
2005-02-03 Tor Lillqvist <tml@novell.com>
* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
wide character version of ImmGetCompositionString() here,
too. (#165278, Takuro Ashie)
2005-02-03 Matthias Clasen <mclasen@redhat.com> 2005-02-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do

View File

@ -1,3 +1,9 @@
2005-02-03 Tor Lillqvist <tml@novell.com>
* modules/input/gtkimcontextime.c (get_pango_attr_list): Use the
wide character version of ImmGetCompositionString() here,
too. (#165278, Takuro Ashie)
2005-02-03 Matthias Clasen <mclasen@redhat.com> 2005-02-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Don't do

View File

@ -446,9 +446,9 @@ get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str)
/* /*
* get attributes list of IME. * get attributes list of IME.
*/ */
len = ImmGetCompositionStringA (himc, GCS_COMPATTR, NULL, 0); len = ImmGetCompositionStringW (himc, GCS_COMPATTR, NULL, 0);
buf = g_alloca (len); buf = g_alloca (len);
ImmGetCompositionStringA (himc, GCS_COMPATTR, buf, len); ImmGetCompositionStringW (himc, GCS_COMPATTR, buf, len);
/* /*
* schr and echr are pointer in utf8str. * schr and echr are pointer in utf8str.