data: merge wayland and X11 session files

The files are basically identical now, so just merge them
together.

3 files changed, 2 insertions, 13 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index d1d8d255..18ef42e9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,11 +21,11 @@ endif
 xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
 
 wayland_sessiondir = $(datadir)/wayland-sessions
-wayland_session_in_files = gnome-wayland.desktop.in
+wayland_session_in_files = gnome.desktop.in
 wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
 
 sessiondir = $(datadir)/gnome-session/sessions
-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in
+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in
 session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
 session_DATA = $(session_in_files:.session.desktop.in=.session)
 
diff --git a/data/gnome-wayland.desktop.in b/data/gnome-wayland.desktop.in
deleted file mode 100644
index 7f979680..00000000
--- a/data/gnome-wayland.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=GNOME on Wayland
-_Comment=This session logs you into GNOME, using Wayland
-Exec=gnome-session --session=gnome-wayland
-TryExec=gnome-session
-Icon=
-Type=Application
-DesktopNames=GNOME
diff --git a/data/gnome-wayland.session.desktop.in.in b/data/gnome-wayland.session.desktop.in.in
deleted file mode 100644
index 37fff5e6..00000000
--- a/data/gnome-wayland.session.desktop.in.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[GNOME Session]
-_Name=GNOME on Wayland
-RequiredComponents=org.gnome.Shell;gnome-settings-daemon;