xserver: Branch 'master'

[Jon TURNEY]

 hw/xwin/winclipboardwrappers.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 803522300344265f11ea9f869ee6747730413bae
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Wed Jun 10 13:32:54 2009 +0100

    Xming: Simplify logic for ownership release of native clipboard
    
    Make the logic simpler for the ownership release of the Windows
    clipboard in winclipboardwrappers.c - We've already marked a selection
    as unowned if it is owned by our clipboard window
    
    Copyright (C) Colin Harrison 2005-2008
    http://www.straightrunning.com/XmingNotes/
    http://sourceforge.net/projects/xming/
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index 14f76cd..c68d78a 100755
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -437,11 +437,9 @@ winProcSetSelectionOwner (ClientPtr client)
    * an owned to not owned transition was detected,
    * and we currently own the Win32 clipboard.
    */
-  if (None == stuff->window
-      && (None == s_iOwners[CLIP_OWN_PRIMARY]
-	  || g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
-      && (None == s_iOwners[CLIP_OWN_CLIPBOARD]
-	  || g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
+  if (stuff->window == None
+      && s_iOwners[CLIP_OWN_PRIMARY] == None
+      && s_iOwners[CLIP_OWN_CLIPBOARD] == None
       && fOwnedToNotOwned
       && g_hwndClipboard != NULL
       && g_hwndClipboard == GetClipboardOwner ())
@@ -458,10 +456,6 @@ winProcSetSelectionOwner (ClientPtr client)
       EmptyClipboard ();
       CloseClipboard ();
 
-      /* Clear X selection ownership (might still be marked as us owning) */
-      s_iOwners[CLIP_OWN_PRIMARY] = None;
-      s_iOwners[CLIP_OWN_CLIPBOARD] = None;
-      
       goto winProcSetSelectionOwner_Done;
     }