Rename wlr_primary_selection to wlr_gtk_primary_selection

4 files changed, 17 insertions, 17 deletions

diff --git a/xwayland/selection/dnd.c b/xwayland/selection/dnd.c
index 534d056c..ec5f16c7 100644
--- a/xwayland/selection/dnd.c
+++ b/xwayland/selection/dnd.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_gtk_primary_selection.h>
 #include <wlr/util/log.h>
 #include <xcb/xfixes.h>
 #include "xwayland/xwm.h"
diff --git a/xwayland/selection/incoming.c b/xwayland/selection/incoming.c
index 5b253b5d..d4d7d553 100644
--- a/xwayland/selection/incoming.c
+++ b/xwayland/selection/incoming.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_gtk_primary_selection.h>
 #include <wlr/util/log.h>
 #include <xcb/xfixes.h>
 #include "xwayland/xwm.h"
@@ -217,21 +217,21 @@ static const struct wlr_data_source_impl data_source_impl = {
 };
 
 struct x11_primary_selection_source {
-	struct wlr_primary_selection_source base;
+	struct wlr_gtk_primary_selection_source base;
 	struct wlr_xwm_selection *selection;
 	struct wl_array mime_types_atoms;
 };
 
 static void primary_selection_source_cancel(
-	struct wlr_primary_selection_source *wlr_source);
+	struct wlr_gtk_primary_selection_source *wlr_source);
 
 bool primary_selection_source_is_xwayland(
-		struct wlr_primary_selection_source *wlr_source) {
+		struct wlr_gtk_primary_selection_source *wlr_source) {
 	return wlr_source->cancel == primary_selection_source_cancel;
 }
 
 static void primary_selection_source_send(
-		struct wlr_primary_selection_source *wlr_source, const char *mime_type,
+		struct wlr_gtk_primary_selection_source *wlr_source, const char *mime_type,
 		int32_t fd) {
 	struct x11_primary_selection_source *source =
 		(struct x11_primary_selection_source *)wlr_source;
@@ -242,10 +242,10 @@ static void primary_selection_source_send(
 }
 
 static void primary_selection_source_cancel(
-		struct wlr_primary_selection_source *wlr_source) {
+		struct wlr_gtk_primary_selection_source *wlr_source) {
 	struct x11_primary_selection_source *source =
 		(struct x11_primary_selection_source *)wlr_source;
-	wlr_primary_selection_source_finish(&source->base);
+	wlr_gtk_primary_selection_source_finish(&source->base);
 	wl_array_release(&source->mime_types_atoms);
 	free(source);
 }
@@ -356,7 +356,7 @@ static void xwm_selection_get_targets(struct wlr_xwm_selection *selection) {
 		if (source == NULL) {
 			return;
 		}
-		wlr_primary_selection_source_init(&source->base);
+		wlr_gtk_primary_selection_source_init(&source->base);
 		source->base.send = primary_selection_source_send;
 		source->base.cancel = primary_selection_source_cancel;
 
@@ -366,7 +366,7 @@ static void xwm_selection_get_targets(struct wlr_xwm_selection *selection) {
 		bool ok = source_get_targets(selection, &source->base.mime_types,
 			&source->mime_types_atoms);
 		if (ok) {
-			wlr_seat_set_primary_selection(xwm->seat, &source->base,
+			wlr_seat_set_gtk_primary_selection(xwm->seat, &source->base,
 				wl_display_next_serial(xwm->xwayland->wl_display));
 		} else {
 			source->base.cancel(&source->base);
@@ -424,7 +424,7 @@ int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
 				wlr_seat_set_selection(xwm->seat, NULL,
 					wl_display_next_serial(xwm->xwayland->wl_display));
 			} else if (selection == &xwm->primary_selection) {
-				wlr_seat_set_primary_selection(xwm->seat, NULL,
+				wlr_seat_set_gtk_primary_selection(xwm->seat, NULL,
 					wl_display_next_serial(xwm->xwayland->wl_display));
 			} else if (selection == &xwm->dnd_selection) {
 				// TODO: DND
diff --git a/xwayland/selection/outgoing.c b/xwayland/selection/outgoing.c
index 0c095d25..b658ab52 100644
--- a/xwayland/selection/outgoing.c
+++ b/xwayland/selection/outgoing.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_gtk_primary_selection.h>
 #include <wlr/util/log.h>
 #include <xcb/xfixes.h>
 #include "xwayland/xwm.h"
@@ -195,7 +195,7 @@ static void xwm_selection_source_send(struct wlr_xwm_selection *selection,
 			return;
 		}
 	} else if (selection == &selection->xwm->primary_selection) {
-		struct wlr_primary_selection_source *source =
+		struct wlr_gtk_primary_selection_source *source =
 			selection->xwm->seat->primary_selection_source;
 		if (source != NULL) {
 			source->send(source, mime_type, fd);
@@ -231,7 +231,7 @@ static struct wl_array *xwm_selection_source_get_mime_types(
 			return &source->mime_types;
 		}
 	} else if (selection == &selection->xwm->primary_selection) {
-		struct wlr_primary_selection_source *source =
+		struct wlr_gtk_primary_selection_source *source =
 			selection->xwm->seat->primary_selection_source;
 		if (source != NULL) {
 			return &source->mime_types;
diff --git a/xwayland/selection/selection.c b/xwayland/selection/selection.c
index d9de5643..a29eeeae 100644
--- a/xwayland/selection/selection.c
+++ b/xwayland/selection/selection.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_primary_selection.h>
+#include <wlr/types/wlr_gtk_primary_selection.h>
 #include <wlr/util/log.h>
 #include <xcb/xfixes.h>
 #include "xwayland/xwm.h"
@@ -231,7 +231,7 @@ void xwm_selection_finish(struct wlr_xwm *xwm) {
 		if (xwm->seat->primary_selection_source &&
 				primary_selection_source_is_xwayland(
 					xwm->seat->primary_selection_source)) {
-			wlr_seat_set_primary_selection(xwm->seat, NULL,
+			wlr_seat_set_gtk_primary_selection(xwm->seat, NULL,
 				wl_display_next_serial(xwm->xwayland->wl_display));
 		}
 		wlr_xwayland_set_seat(xwm->xwayland, NULL);
@@ -274,7 +274,7 @@ static void seat_handle_primary_selection(struct wl_listener *listener,
 	struct wlr_seat *seat = data;
 	struct wlr_xwm *xwm =
 		wl_container_of(listener, xwm, seat_primary_selection);
-	struct wlr_primary_selection_source *source = seat->primary_selection_source;
+	struct wlr_gtk_primary_selection_source *source = seat->primary_selection_source;
 
 	if (source != NULL &&
 			primary_selection_source_is_xwayland(