diff --git a/ChangeLog b/ChangeLog index 6484380d41..662d56a517 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 11 17:51:10 2004 Owen Taylor + + * modules/input/gtkimcontextxim.c (preedit_done_callback): + Clear preedit string and emit preedit_changed as needed + on AIX. (#130617, Philip K Warren) + 2004-03-11 Morten Welinder * gtk/gtkpathbar.c (_gtk_path_bar_set_file_system): Plug leak. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6484380d41..662d56a517 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Mar 11 17:51:10 2004 Owen Taylor + + * modules/input/gtkimcontextxim.c (preedit_done_callback): + Clear preedit string and emit preedit_changed as needed + on AIX. (#130617, Philip K Warren) + 2004-03-11 Morten Welinder * gtk/gtkpathbar.c (_gtk_path_bar_set_file_system): Plug leak. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6484380d41..662d56a517 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Mar 11 17:51:10 2004 Owen Taylor + + * modules/input/gtkimcontextxim.c (preedit_done_callback): + Clear preedit string and emit preedit_changed as needed + on AIX. (#130617, Philip K Warren) + 2004-03-11 Morten Welinder * gtk/gtkpathbar.c (_gtk_path_bar_set_file_system): Plug leak. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6484380d41..662d56a517 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Mar 11 17:51:10 2004 Owen Taylor + + * modules/input/gtkimcontextxim.c (preedit_done_callback): + Clear preedit string and emit preedit_changed as needed + on AIX. (#130617, Philip K Warren) + 2004-03-11 Morten Welinder * gtk/gtkpathbar.c (_gtk_path_bar_set_file_system): Plug leak. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6484380d41..662d56a517 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Mar 11 17:51:10 2004 Owen Taylor + + * modules/input/gtkimcontextxim.c (preedit_done_callback): + Clear preedit string and emit preedit_changed as needed + on AIX. (#130617, Philip K Warren) + 2004-03-11 Morten Welinder * gtk/gtkpathbar.c (_gtk_path_bar_set_file_system): Plug leak. diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 93121e5a49..14998a699a 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -991,6 +991,13 @@ preedit_done_callback (XIC xic, GtkIMContext *context = GTK_IM_CONTEXT (client_data); GtkIMContextXIM *context_xim = GTK_IM_CONTEXT_XIM (context); + if (context_xim->preedit_length) + { + context_xim->preedit_length = 0; + if (!context_xim->finalizing) + g_signal_emit_by_name (context_xim, "preedit_changed"); + } + if (!context_xim->finalizing) g_signal_emit_by_name (context, "preedit_end"); }