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
2004-02-14 00:22:15 +00:00
parent 68e59d72a2
commit b6c2f5af2e
2 changed files with 1 additions and 2 deletions
--- 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)
    {
--- 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