summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am6
-rw-r--r--data/applications/Makefile.am1
-rw-r--r--data/applications/gnome-shell.desktop.in7
-rw-r--r--data/gdm-fallback.session (renamed from data/gdm.session)0
-rw-r--r--data/gdm-shell.session.in5
5 files changed, 18 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 67c97b42..1a709946 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -74,11 +74,15 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
-e 's,[@]sbindir[@],$(sbindir),g' \
<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
+gdm-shell.session: $(srcdir)/gdm-shell.session.in
+ sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
+ < $(srcdir)/gdm-shell.session.in > gdm-shell.session
+
localealiasdir = $(datadir)/gdm
localealias_DATA = locale.alias
sessiondir = $(datadir)/gnome-session/sessions
-dist_session_DATA = gdm.session
+dist_session_DATA = gdm-fallback.session gdm-shell.session
EXTRA_DIST = \
$(schemas_in_files) \
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
index cdaf80a9..339e12b6 100644
--- a/data/applications/Makefile.am
+++ b/data/applications/Makefile.am
@@ -14,6 +14,7 @@ edit = sed \
desktopdir = $(pkgdatadir)/greeter/applications
desktop_in_files = \
gdm-simple-greeter.desktop.in \
+ gnome-shell.desktop.in \
gnome-mag.desktop.in \
gok.desktop.in \
orca-screen-reader.desktop.in \
diff --git a/data/applications/gnome-shell.desktop.in b/data/applications/gnome-shell.desktop.in
new file mode 100644
index 00000000..ceef4f03
--- /dev/null
+++ b/data/applications/gnome-shell.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+_Name=GNOME Shell
+_Comment=Window management and compositing
+Exec=/usr/bin/gnome-shell --gdm-mode
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/data/gdm.session b/data/gdm-fallback.session
index 1f0da4d6..1f0da4d6 100644
--- a/data/gdm.session
+++ b/data/gdm-fallback.session
diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
new file mode 100644
index 00000000..2693f025
--- /dev/null
+++ b/data/gdm-shell.session.in
@@ -0,0 +1,5 @@
+[GNOME Session]
+Name=Display Manager
+RequiredComponents=gnome-shell;gnome-settings-daemon;
+IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
+FallbackSession=gdm