[PATCH] xwayland: Allow dump_property when selection fails
Bryce Harrington
bryce at osg.samsung.com
Fri Jul 10 18:16:11 PDT 2015
dump_property allows reply to be NULL. Calling it unconditionally will
ensure user knows where the selection failed.
Also refactor code a bit.
Suggested by Marek Chalupa
Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
---
xwayland/selection.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/xwayland/selection.c b/xwayland/selection.c
index 2f60c0e..452cd69 100644
--- a/xwayland/selection.c
+++ b/xwayland/selection.c
@@ -240,14 +240,14 @@ weston_wm_get_selection_data(struct weston_wm *wm)
0x1fffffff /* length */);
reply = xcb_get_property_reply(wm->conn, cookie, NULL);
- if (reply == NULL)
- return;
- if (reply->type == wm->atom.incr) {
- dump_property(wm, wm->atom.wl_selection, reply);
+ dump_property(wm, wm->atom.wl_selection, reply);
+
+ if (reply == NULL) {
+ return;
+ } else if (reply->type == wm->atom.incr) {
wm->incr = 1;
} else {
- dump_property(wm, wm->atom.wl_selection, reply);
wm->incr = 0;
weston_wm_write_property(wm, reply);
}
--
1.9.1
More information about the wayland-devel
mailing list