From: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed, 4 Jan 2012 04:00:12 +0000 (-0500)
Subject: x11: Dont claim the X11 selection when we set the proxy Wayland selection
X-Git-Tag: 0.85.0~116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7126ef53786fdf8f24285fc759c9ef9e4bdd491;p=platform%2Fupstream%2Fweston.git

x11: Dont claim the X11 selection when we set the proxy Wayland selection
---

diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c
index e6eb808..7d7829b 100644
--- a/src/xserver-launcher.c
+++ b/src/xserver-launcher.c
@@ -457,6 +457,9 @@ weston_wm_set_selection(struct weston_selection_listener *listener,
 	const char **p, **end;
 	int has_text_plain = 0;
 
+	if (source->offer_interface == &data_offer_interface)
+		return;
+
 	fprintf(stderr, "set selection\n");
 
 	p = source->mime_types.data;
@@ -470,8 +473,7 @@ weston_wm_set_selection(struct weston_selection_listener *listener,
 		p++;
 	}
 
-	if (wm && has_text_plain &&
-	    source->offer_interface != &data_offer_interface) {
+	if (has_text_plain) {
 		xcb_set_selection_owner(wm->conn,
 					wm->selection_window,
 					wm->atom.clipboard,