aboutsummaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-04-25 23:24:58 +0100
committeremersion <contact@emersion.fr>2018-04-25 23:24:58 +0100
commit71ca45e2c0cbecf8fb24f0cab019646d92cce14b (patch)
tree001f93657d3de3d7baafa280dc7eb13abc9dd3a9 /xwayland
parentf9f75a13623726ec56810eb89b60ca43462e1ca2 (diff)
Make sure we don't use others' prefixes
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/selection/incoming.c6
-rw-r--r--xwayland/selection/selection.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/xwayland/selection/incoming.c b/xwayland/selection/incoming.c
index ab06f40d..e983cf9f 100644
--- a/xwayland/selection/incoming.c
+++ b/xwayland/selection/incoming.c
@@ -182,14 +182,14 @@ struct x11_data_source {
static const struct wlr_data_source_impl data_source_impl;
-bool wlr_data_source_is_xwayland_data_source(
+bool data_source_is_xwayland(
struct wlr_data_source *wlr_source) {
return wlr_source->impl == &data_source_impl;
}
static struct x11_data_source *data_source_from_wlr_data_source(
struct wlr_data_source *wlr_source) {
- assert(wlr_data_source_is_xwayland_data_source(wlr_source));
+ assert(data_source_is_xwayland(wlr_source));
return (struct x11_data_source *)wlr_source;
}
@@ -225,7 +225,7 @@ struct x11_primary_selection_source {
static void primary_selection_source_cancel(
struct wlr_primary_selection_source *wlr_source);
-bool wlr_primary_selection_source_is_xwayland_primary_selection_source(
+bool primary_selection_source_is_xwayland(
struct wlr_primary_selection_source *wlr_source) {
return wlr_source->cancel == primary_selection_source_cancel;
}
diff --git a/xwayland/selection/selection.c b/xwayland/selection/selection.c
index 39c47c45..6b57f7c3 100644
--- a/xwayland/selection/selection.c
+++ b/xwayland/selection/selection.c
@@ -223,13 +223,13 @@ void xwm_selection_finish(struct wlr_xwm *xwm) {
}
if (xwm->seat) {
if (xwm->seat->selection_source &&
- wlr_data_source_is_xwayland_data_source(
+ data_source_is_xwayland(
xwm->seat->selection_source)) {
wlr_seat_set_selection(xwm->seat, NULL,
wl_display_next_serial(xwm->xwayland->wl_display));
}
if (xwm->seat->primary_selection_source &&
- wlr_primary_selection_source_is_xwayland_primary_selection_source(
+ primary_selection_source_is_xwayland(
xwm->seat->primary_selection_source)) {
wlr_seat_set_primary_selection(xwm->seat, NULL,
wl_display_next_serial(xwm->xwayland->wl_display));
@@ -262,7 +262,7 @@ static void seat_handle_selection(struct wl_listener *listener,
wl_container_of(listener, xwm, seat_selection);
struct wlr_data_source *source = seat->selection_source;
- if (source != NULL && wlr_data_source_is_xwayland_data_source(source)) {
+ if (source != NULL && data_source_is_xwayland(source)) {
return;
}
@@ -277,7 +277,7 @@ static void seat_handle_primary_selection(struct wl_listener *listener,
struct wlr_primary_selection_source *source = seat->primary_selection_source;
if (source != NULL &&
- wlr_primary_selection_source_is_xwayland_primary_selection_source(
+ primary_selection_source_is_xwayland(
source)) {
return;
}