Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winkeynames.h
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwndproc.c

1 files changed, 20 insertions, 19 deletions

diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c
index 3ba110956..b5c7786b0 100644
--- a/xorg-server/hw/xwin/winmultiwindowwndproc.c
+++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c
@@ -705,10 +705,11 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
       /* Remove our keyboard hook if it is installed */
       winRemoveKeyboardHookLL ();
-       /* Revert the X focus as well, but only if the Windows focus is going to another window */
-      if (!wParam)
-	if (pWin)
-	  DeleteWindowFromAnyEvents(pWin, FALSE);
+
+      /* Revert the X focus as well, but only if the Windows focus is going to another window */
+      if (!wParam && pWin)
+          DeleteWindowFromAnyEvents(pWin, FALSE);
+
       return 0;
 
     case WM_SYSDEADCHAR:      
@@ -891,21 +892,21 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
 
 	      winUpdateWindowPosition (hwnd, FALSE, &zstyle);
 
-	      {
-	        WinXWMHints hints;
-	        if (winMultiWindowGetWMHints(pWin, &hints))
-	        {
-	            /*
-	              Give the window focus, unless it has an InputHint
-	              which is FALSE (this is used by e.g. glean to
-	              avoid every test window grabbing the focus)
-	             */
-	            if (!((hints.flags & InputHint) && (!hints.input)))
-	              {
-	                SetForegroundWindow (hwnd);
-	              }
-	          }
-	      }
+              {
+                WinXWMHints hints;
+                if (winMultiWindowGetWMHints(pWin, &hints))
+                  {
+                    /*
+                      Give the window focus, unless it has an InputHint
+                      which is FALSE (this is used by e.g. glean to
+                      avoid every test window grabbing the focus)
+                     */
+                    if (!((hints.flags & InputHint) && (!hints.input)))
+                      {
+                        SetForegroundWindow (hwnd);
+                      }
+                  }
+              }
 	    }
 	  wmMsg.msg = WM_WM_MAP3;
 	}