From 3a6d4aca797d3569d6752ac239a32e2ea0d47054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Sat, 3 Feb 2024 16:10:51 +0100
Subject: [PATCH] Remove -x11 suffix from file names that do not contain an X11
 impl

gs-grab-x11.c is X11 only and gs-window-x11.c mixes X11 and Wayland.
This also aligns file names with class names.
---
 src/Makefile.am                      | 8 ++++----
 src/{gs-grab-x11.c => gs-grab.c}     | 0
 src/{gs-window-x11.c => gs-window.c} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{gs-grab-x11.c => gs-grab.c} (100%)
 rename src/{gs-window-x11.c => gs-window.c} (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a3e8ab6..af3c7526 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,7 @@ test_passwd_LDADD = \
 test_window_SOURCES = \
 	test-window.c    \
 	gs-window.h      \
-	gs-window-x11.c  \
+	gs-window.c      \
 	gs-marshal.c     \
 	gs-marshal.h     \
 	gs-debug.c       \
@@ -132,7 +132,7 @@ test_window_LDADD = \
 
 if ENABLE_X11
 test_window_SOURCES += \
-	gs-grab-x11.c \
+	gs-grab.c \
 	gs-grab.h \
 	$(NULL)
 
@@ -254,7 +254,7 @@ xfce4_screensaver_SOURCES = \
 	gs-listener.h               \
 	gs-manager.c                \
 	gs-manager.h                \
-	gs-window-x11.c             \
+	gs-window.c                 \
 	gs-window.h                 \
 	gs-prefs.c                  \
 	gs-prefs.h                  \
@@ -297,7 +297,7 @@ if ENABLE_X11
 xfce4_screensaver_SOURCES += \
 	gs-listener-x11.c \
 	gs-listener-x11.h \
-	gs-grab-x11.c \
+	gs-grab.c \
 	gs-grab.h \
 	$(NULL)
 
diff --git a/src/gs-grab-x11.c b/src/gs-grab.c
similarity index 100%
rename from src/gs-grab-x11.c
rename to src/gs-grab.c
diff --git a/src/gs-window-x11.c b/src/gs-window.c
similarity index 100%
rename from src/gs-window-x11.c
rename to src/gs-window.c
-- 
GitLab