[gdm/wip/shell-greeter: 2/2] data: add shell session

[Ray Strode <halfline src gnome org>]

commit 318f3e69da1dfbdd406a562760caae6149482bb0
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jun 20 13:17:31 2011 -0400

    data: add shell session
    
    This commit changes gdm to first try running gnome-shell in --login-mode
    and fallback to the existing way.

 daemon/gdm-greeter-session.c               |    2 +-
 data/Makefile.am                           |    6 +++++-
 data/applications/Makefile.am              |    1 +
 data/applications/gnome-shell.desktop.in   |    7 +++++++
 data/{gdm.session => gdm-fallback.session} |    0
 data/gdm-shell.session.in                  |    5 +++++
 6 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index d0b1b94..3fbbb78 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -78,7 +78,7 @@ gdm_greeter_session_new (const char *display_name,
         GObject *object;
 
         object = g_object_new (GDM_TYPE_GREETER_SESSION,
-                               "command", BINDIR "/gnome-session --session gdm",
+                               "command", BINDIR "/gnome-session --debug --session gdm-shell",
                                "server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH,
                                "server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE,
                                "server-env-var-name", "GDM_GREETER_DBUS_ADDRESS",
diff --git a/data/Makefile.am b/data/Makefile.am
index 67c97b4..1a70994 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 cdaf80a..339e12b 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 0000000..824d0e1
--- /dev/null
+++ b/data/applications/gnome-shell.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+_Name=GNOME Shell
+_Comment=Window management and application launching
+Exec=/usr/bin/gnome-shell --login-mode
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
diff --git a/data/gdm.session b/data/gdm-fallback.session
similarity index 100%
rename from data/gdm.session
rename to data/gdm-fallback.session
diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
new file mode 100644
index 0000000..2693f02
--- /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