don't reset the input method here -- it may be in the middle of something

* src/vte.c(vte_terminal_feed_child): don't reset the input method here -- it
	may be in the middle of something (Red Hat #81542).  From HEAD.
* src/vte.c(vte_terminal_im_commit): reset the input method when we get text
	committed (Red Hat #81542).  From HEAD.

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b83e6bd..256cd3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-20
+	* src/vte.c(vte_terminal_feed_child): don't reset the input method
+	here -- it may be in the middle of something (Red Hat #81542).  From
+	HEAD.
+	* src/vte.c(vte_terminal_im_commit): reset the input method when we
+	get text committed (Red Hat #81542).  From HEAD.
+
 2003-02-19 nalin
 	* src/vte.c(vte_terminal_focus_in/focus_out): don't pass focus status
 	changes on to our IM context when we're not realized, because we don't
diff --git a/src/vte.c b/src/vte.c
index c9e06dd..e1c2d3d 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -7574,7 +7574,6 @@ vte_terminal_feed_child(VteTerminal *terminal, const char *data, glong length)
 	if (length == ((gssize)-1)) {
 		length = strlen(data);
 	}
-	vte_terminal_im_reset(terminal);
 	if (length > 0) {
 		vte_terminal_send(terminal, "UTF-8", data, length);
 	}
@@ -7594,6 +7593,7 @@ vte_terminal_im_commit(GtkIMContext *im_context, gchar *text, gpointer data)
 #endif
 	terminal = VTE_TERMINAL(data);
 	vte_terminal_feed_child(terminal, text, -1);
+	vte_terminal_im_reset(terminal);
 	/* Committed text was committed because the user pressed a key, so
 	 * we need to obey the scroll-on-keystroke setting. */
 	if (terminal->pvt->scroll_on_keystroke) {