merges from head

git-svn-id: svn://10.0.0.236/branches/SUPERWIN@53737 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/widget/src/gtk/nsWidget.cpp

@@ -2080,6 +2080,7 @@ nsWidget::OnFocusInSignal(GdkEventFocus * aGdkFocusEvent)
     if (gdkWindow)
     {
       gdk_im_begin ((GdkIC*)mIC, gdkWindow);
+#if 0
       // set spot location
       nsCompositionEvent compEvent;
       nsEventStatus status;
@@ -2093,6 +2094,7 @@ nsWidget::OnFocusInSignal(GdkEventFocus * aGdkFocusEvent)
       DispatchEvent(&compEvent, status);
       // set SpotLocation
       SetXICSpotLocation(compEvent.theReply.mCursorPosition);
+#endif
     }
     else
     {

mozilla/widget/src/gtk/nsWindow.cpp

@@ -188,6 +188,7 @@ NS_IMETHODIMP nsWindow::Destroy()
   // window, for example, the application will exit as it should.
 
   if (mIsDestroyingWindow == PR_TRUE) {
+    NS_IF_RELEASE(mParent);
     nsBaseWidget::Destroy();
     if (PR_FALSE == mOnDestroyCalled) {
         nsWidget::OnDestroy();