projects
/
profile
/
ivi
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a33d0c3
)
x11: Dont claim the X11 selection when we set the proxy Wayland selection
author
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 4 Jan 2012 04:00:12 +0000
(23:00 -0500)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 4 Jan 2012 04:01:47 +0000
(23:01 -0500)
src/xserver-launcher.c
patch
|
blob
|
history
diff --git
a/src/xserver-launcher.c
b/src/xserver-launcher.c
index
e6eb808
..
7d7829b
100644
(file)
--- 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,