- Removed waiting until clipboard was started after being launched in

  function winProcSetSelectionOwner. (This was causing a dead lock)
- Changed welcome message
- Synchronised winclipboardxevents with the version on the release branch
  (Removed calls to XLockDisplay and XUnlockDisplay)
- Call to XInitThreads has been moved to the beginning of dix\main. This
  function should be called before any call to a Xlib function.

1 files changed, 0 insertions, 11 deletions

diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index 233c0489b..3d5323cc7 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -342,20 +342,9 @@ winProcSetSelectionOwner (ClientPtr client)
   /* Abort if clipboard not completely initialized yet */
   if (!g_fClipboardStarted)
     {
-      if (g_fClipboardLaunched)
-      {
-         // Just wait until it is started
-        ErrorF ("winProcSetSelectionOwner - waiting to be started.\n");
-        while (g_fClipboardLaunched && !g_fClipboardStarted)
-          Sleep(0);
-        ErrorF ("winProcSetSelectionOwner - Clipboard started.\n");
-      }
-      else
-      {
         ErrorF ("winProcSetSelectionOwner - Clipboard not yet started, "
 	        "aborting.\n");
         goto winProcSetSelectionOwner_Done;
-      }
     }
   
   /* Grab window if we have one */