Commit 88584e96 authored by Ray Strode's avatar Ray Strode

data: merge wayland and X11 session files

The files are basically identical now, so just merge them
together.
parent 95cc9792
......@@ -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)
......
[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
[GNOME Session]
_Name=GNOME on Wayland
RequiredComponents=org.gnome.Shell;gnome-settings-daemon;
......@@ -4,8 +4,6 @@ data/gnome-custom-session.desktop.in
data/gnome.desktop.in
data/gnome-dummy.session.desktop.in.in
data/gnome.session.desktop.in.in
data/gnome-wayland.desktop.in
data/gnome-wayland.session.desktop.in.in
[type: gettext/glade]data/session-selector.ui
[type: gettext/glade]data/session-properties.ui
gnome-session/gsm-fail-whale-dialog.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment