From 759a0075a03efc47b6eed471a3a735cc801b5a78 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Sat, 14 May 2011 04:27:52 +0000
Subject: [PATCH] Add GNOME3 gdm/gnome-session support.

SVN revision: 59377
---
 e16.spec.in                    | 1 +
 misc/Makefile.am               | 7 ++++++-
 misc/e16-gnome-session.desktop | 5 +++++
 misc/e16-gnome.session         | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 misc/e16-gnome-session.desktop
 create mode 100644 misc/e16-gnome.session

diff --git a/e16.spec.in b/e16.spec.in
index c1464078..c9cfe23e 100644
--- a/e16.spec.in
+++ b/e16.spec.in
@@ -56,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/locale/*
 %{_datadir}/applications/*
 %{_datadir}/xsessions/*
+%{_datadir}/gnome-session/sessions/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 %{_mandir}/*
 
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 0ddb9d70..b2335726 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -12,12 +12,17 @@ misc_SCRIPTS = $(XCLIENTS) starte16 e16-dbus-cmd
 
 applicationdir = $(datadir)/applications
 xsessiondir = $(datadir)/xsessions
+gsessiondir = $(datadir)/gnome-session/sessions
 
 # Is this Fedora only stuff?
 #xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
 #xclients_SCRIPTS = $(XCLIENTS)
 
-EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SCRIPTS) starte16.in
+xsession_DATA = e16-gnome-session.desktop
+gsession_DATA = e16-gnome.session
+
+EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SCRIPTS) starte16.in \
+		$(xsession_DATA) $(gsession_DATA)
 
 CLEANFILES = $(DESKTOPS) starte16
 
diff --git a/misc/e16-gnome-session.desktop b/misc/e16-gnome-session.desktop
new file mode 100644
index 00000000..63c15af2
--- /dev/null
+++ b/misc/e16-gnome-session.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=E16 GNOME
+Type=XSession
+TryExec=/usr/bin/gnome-session
+Exec=gnome-session --session=e16-gnome
diff --git a/misc/e16-gnome.session b/misc/e16-gnome.session
new file mode 100644
index 00000000..e12eae14
--- /dev/null
+++ b/misc/e16-gnome.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=gnome-e16 session
+RequiredComponents=gnome-panel;gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=e16
+DefaultProvider-notifications=notification-daemon