From e7126ef53786fdf8f24285fc759c9ef9e4bdd491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Tue, 3 Jan 2012 23:00:12 -0500 Subject: [PATCH] x11: Dont claim the X11 selection when we set the proxy Wayland selection --- src/xserver-launcher.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c index e6eb8088..7d7829b7 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,