daemon: use gnome-session session files instead of autostart

Before we were doing some sort of weird hybrid thing with
a session file and an autostart directory that wasn't that
much different than just having an autostart directory by
itself.

Now we fully define the session component list from the session
file, and merely provide a pool of new candidate desktop files to
select that sessoin from.

This modernizes how we use gnome-session and as a side-effect
enables us the ability to have fallback sessions (which will
be important when defaulting to a shell based greeter later).

6 files changed, 100 insertions, 0 deletions

diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
new file mode 100644
index 00000000..cdaf80a9
--- /dev/null
+++ b/data/applications/Makefile.am
@@ -0,0 +1,38 @@
+NULL =
+
+edit = sed \
+	-e 's|@SBINDIR[@]|$(sbindir)|g' \
+	-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
+	-e 's|@LIBDIR[@]|$(libdir)|g' \
+	-e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
+	-e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g'
+
+%.desktop.in: %.desktop.in.in Makefile
+	$(edit) $< >$@
+
+@INTLTOOL_DESKTOP_RULE@
+desktopdir = $(pkgdatadir)/greeter/applications
+desktop_in_files = 							\
+	gdm-simple-greeter.desktop.in					\
+	gnome-mag.desktop.in						\
+	gok.desktop.in							\
+	orca-screen-reader.desktop.in					\
+	$(NULL)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)			\
+	       mime-dummy-handler.desktop				\
+	       mimeapps.list						\
+	       $(NULL)
+
+EXTRA_DIST =								\
+	gdm-simple-greeter.desktop.in.in				\
+	$(desktop_in_files)						\
+	$(NULL)
+
+DISTCLEANFILES =							\
+	$(desktop_DATA)							\
+	gdm-simple-greeter.desktop.in					\
+	$(NULL)
+
+MAINTAINERCLEANFILES =                  				\
+        *~                              				\
+        Makefile.in
diff --git a/data/applications/gdm-simple-greeter.desktop.in.in b/data/applications/gdm-simple-greeter.desktop.in.in
new file mode 100644
index 00000000..e6b1dbfd
--- /dev/null
+++ b/data/applications/gdm-simple-greeter.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+_Name=Login Window
+Exec=@LIBEXECDIR@/gdm-simple-greeter
+OnlyShowIn=GNOME;
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-AutoRestart=true
+NoDisplay=true
diff --git a/data/applications/gnome-mag.desktop.in b/data/applications/gnome-mag.desktop.in
new file mode 100644
index 00000000..6bb5c0f5
--- /dev/null
+++ b/data/applications/gnome-mag.desktop.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=GNOME Screen Magnifier
+_Comment=Magnify parts of the screen
+TryExec=magnifier
+Exec=magnifier -v -m
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Accessibility;
+AutostartCondition=GNOME /desktop/gnome/applications/at/screen_magnifier_enabled
+X-GNOME-Provides=screen-magnifier
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-mag
+X-GNOME-Bugzilla-Component=general
diff --git a/data/applications/gok.desktop.in b/data/applications/gok.desktop.in
new file mode 100644
index 00000000..61063f7a
--- /dev/null
+++ b/data/applications/gok.desktop.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=GNOME On-Screen Keyboard
+_Comment=Use an on-screen keyboard
+TryExec=gok
+Exec=gok --login --access-method=directselection
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Accessibility;
+AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled
+X-GNOME-Provides=screen-keyboard
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gok
+X-GNOME-Bugzilla-Component=general
diff --git a/data/applications/mime-dummy-handler.desktop b/data/applications/mime-dummy-handler.desktop
new file mode 100644
index 00000000..c94779c6
--- /dev/null
+++ b/data/applications/mime-dummy-handler.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Dummy URI Handler
+Exec=/bin/true %U
+Terminal=false
+StartupNotify=false
diff --git a/data/applications/mimeapps.list b/data/applications/mimeapps.list
new file mode 100644
index 00000000..db3a144d
--- /dev/null
+++ b/data/applications/mimeapps.list
@@ -0,0 +1,19 @@
+[Default Applications]
+x-scheme-handler/file=mime-dummy-handler.desktop
+x-scheme-handler/ftp=mime-dummy-handler.desktop
+x-scheme-handler/ghelp=mime-dummy-handler.desktop
+x-scheme-handler/help=mime-dummy-handler.desktop
+x-scheme-handler/http=mime-dummy-handler.desktop
+x-scheme-handler/https=mime-dummy-handler.desktop
+x-scheme-handler/info=mime-dummy-handler.desktop
+x-scheme-handler/irc=mime-dummy-handler.desktop
+x-scheme-handler/itms=mime-dummy-handler.desktop
+x-scheme-handler/mailto=mime-dummy-handler.desktop
+x-scheme-handler/man=mime-dummy-handler.desktop
+x-scheme-handler/mms=mime-dummy-handler.desktop
+x-scheme-handler/rtp=mime-dummy-handler.desktop
+x-scheme-handler/rtsp=mime-dummy-handler.desktop
+x-scheme-handler/sip=mime-dummy-handler.desktop
+x-scheme-handler/trash=mime-dummy-handler.desktop
+x-scheme-handler/webcal=mime-dummy-handler.desktop
+x-scheme-handler/xmpp=mime-dummy-handler.desktop