From b6c2f5af2e4b7c8ca952e4d175ac741cab202eb4 Mon Sep 17 00:00:00 2001
From: "jshin%mailaps.org"
 <jshin%mailaps.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 14 Feb 2004 00:22:15 +0000
Subject: [PATCH] bug 208095: crashes when ASCII characters are entered before
 any characters that go through an XIM server. patch by smontagu, r=katakai,
 sr=sfraser, a=choffman

git-svn-id: svn://10.0.0.236/trunk@152769 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/libeditor/base/nsEditor.cpp | 2 +-
 mozilla/widget/src/gtk/nsWindow.cpp        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index e461a7e3d80..35b9a5696a9 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -2381,7 +2381,7 @@ NS_IMETHODIMP nsEditor::InsertTextIntoTextNodeImpl(const nsAString& aStringToIns
   nsresult result;
   // suppressIME s used when editor must insert text, yet this text is not
   // part of current ime operation.  example: adjusting whitespace around an ime insertion.
-  if (mInIMEMode && !suppressIME)
+  if (mIMETextRangeList && mInIMEMode && !suppressIME)
   {
     if (!mIMETextNode)
     {
diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp
index a376aa7bb19..ed9164cf6f9 100644
--- a/mozilla/widget/src/gtk/nsWindow.cpp
+++ b/mozilla/widget/src/gtk/nsWindow.cpp
@@ -3794,7 +3794,6 @@ nsWindow::SetXICSpotLocation(nsIMEGtkIC* aXIC, nsPoint aPoint)
 
 void
 nsWindow::ime_preedit_start() {
-  IMEComposeStart(nsnull);
 }
 
 void