summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGiovanni Campagna <gcampagn@redhat.com>2013-07-30 18:29:12 +0200
committerRay Strode <rstrode@redhat.com>2013-09-09 16:42:26 -0400
commitcdeedf650e4db5337172b3015af9e0cd368d365a (patch)
tree6d105e2ec0263cbe76bca256a0a1aba045fe94f7 /data
parentffc845b6ff1727952b3c0a276da97caf98feb69d (diff)
downloadgnome-session-cdeedf650e4db5337172b3015af9e0cd368d365a.tar.gz
Add basic support for running in wayland
Add gnome-wayland, a session running gnome-shell-wayland and gnome-settings-daemon. https://bugzilla.gnome.org/show_bug.cgi?id=706420
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am4
-rw-r--r--data/gnome-wayland.desktop.in7
-rw-r--r--data/gnome-wayland.session.desktop.in.in2
3 files changed, 10 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 16926f9f..8fe963db 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ hwcompatdir = $(pkgdatadir)
hwcompat_DATA = hardware-compatibility
xsessiondir = $(datadir)/xsessions
-xsession_in_files = gnome.desktop.in
+xsession_in_files = gnome.desktop.in gnome-wayland.desktop.in
if BUILD_SESSION_SELECTOR
xsession_in_files += gnome-custom-session.desktop.in
@@ -25,7 +25,7 @@ desktop_in_files = gnome-session-properties.desktop.in
desktop_DATA = $(desktop_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
+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.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
new file mode 100644
index 00000000..9d7c353b
--- /dev/null
+++ b/data/gnome-wayland.desktop.in
@@ -0,0 +1,7 @@
+[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
diff --git a/data/gnome-wayland.session.desktop.in.in b/data/gnome-wayland.session.desktop.in.in
index cc2bc93c..1c667d88 100644
--- a/data/gnome-wayland.session.desktop.in.in
+++ b/data/gnome-wayland.session.desktop.in.in
@@ -1,3 +1,3 @@
[GNOME Session]
_Name=GNOME on Wayland
-RequiredComponents=gnome-settings-daemon;
+RequiredComponents=gnome-shell-wayland;gnome-settings-daemon;