Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig xserver mesa git update 29 nov 2012

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/os/osinit.c
	xorg-server/os/utils.c

1 files changed, 18 insertions, 17 deletions

diff --git a/xorg-server/hw/xwin/winclipboardxevents.c b/xorg-server/hw/xwin/winclipboardxevents.c
index 7473e6de1..4bb6c12fa 100644..100755
--- a/xorg-server/hw/xwin/winclipboardxevents.c
+++ b/xorg-server/hw/xwin/winclipboardxevents.c
@@ -175,6 +175,24 @@ winClipboardFlushXEvents(HWND hwnd,
                 break;
             }
 
+              /* Access the clipboard */
+            if (!ClipboardOpened)
+            {
+              if (!OpenClipboard (hwnd))
+              {
+                ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
+                        "OpenClipboard () failed: %08lx\n",
+                        GetLastError ());
+
+                /* Abort */
+                fAbort = TRUE;
+                goto winClipboardFlushXEvents_SelectionRequest_Done;
+              }
+	  
+              /* Indicate that clipboard was opened */
+              fCloseClipboard = TRUE;
+            }
+
             /* Check that clipboard format is available */
             if (fUseUnicode && !IsClipboardFormatAvailable(CF_UNICODETEXT)) {
                 static int count;       /* Hack to stop acroread spamming the log */
@@ -202,23 +220,6 @@ winClipboardFlushXEvents(HWND hwnd,
                 goto winClipboardFlushXEvents_SelectionRequest_Done;
             }
 
-            /* Access the clipboard */
-	  if (!ClipboardOpened)
-	  {
-	    if (!OpenClipboard (hwnd))
-	      {
-	        ErrorF ("winClipboardFlushXEvents - SelectionRequest - "
-		        "OpenClipboard () failed: %08lx\n",
-		        GetLastError ());
-
-	        /* Abort */
-	        fAbort = TRUE;
-	         goto winClipboardFlushXEvents_SelectionRequest_Done;
-	      }
-	  
-	    /* Indicate that clipboard was opened */
-	    fCloseClipboard = TRUE;
-	  }
             /* Setup the string style */
             if (event.xselectionrequest.target == XA_STRING)
                 xiccesStyle = XStringStyle;