launch-environment: Use new gnome-session AutostartWhitelistbenzea/autostart-whitelist

We really just want a whitelist of applications to be started through
autostart. Use the new AutostartWhitelist key file to list application
IDs that may be autostarted (while all others are not considered for
autostart).

The main disadvantage is that all applications that potentially should
be autostarted need to be listed here (as part of distribution patches).

In the common case, spice-vdagent should be added to the list.

6 files changed, 1 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index 20ebf9d9..8f4f7172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1461,7 +1461,6 @@ pam_gdm/Makefile
 data/gdm.conf
 data/Makefile
 data/applications/Makefile
-data/autostart/Makefile
 data/dconf/gdm
 common/Makefile
 po/Makefile.in
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index feccf057..9af614eb 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -918,9 +918,6 @@ create_gnome_session_environment (const char *session_id,
         args = g_ptr_array_new ();
         g_ptr_array_add (args, "gnome-session");
 
-        g_ptr_array_add (args, "--autostart");
-        g_ptr_array_add (args, DATADIR "/gdm/greeter/autostart");
-
         if (debug) {
                 g_ptr_array_add (args, "--debug");
         }
diff --git a/data/Makefile.am b/data/Makefile.am
index bda91604..83159234 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,6 @@ EXTRA_DIST =
 
 SUBDIRS =			\
 	applications		\
-	autostart		\
 	$(NULL)
 
 initdir = $(gdmconfdir)/Init
diff --git a/data/autostart/Makefile.am b/data/autostart/Makefile.am
deleted file mode 100644
index 0ca6c861..00000000
--- a/data/autostart/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-NULL =
-
-%.desktop: %.desktop.in Makefile
-	$(AM_V_GEN) sed -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
-
-desktopdir = $(pkgdatadir)/greeter/autostart
-desktop_in_files =							\
-	$(NULL)
-desktop_DATA = orca-autostart.desktop					\
-	       $(NULL)
-
-EXTRA_DIST =								\
-	$(desktop_in_files)						\
-	$(desktop_DATA)							\
-	$(NULL)
-
-DISTCLEANFILES =							\
-	$(NULL)
-
-MAINTAINERCLEANFILES =                  				\
-        *~                              				\
-        Makefile.in
diff --git a/data/autostart/orca-autostart.desktop b/data/autostart/orca-autostart.desktop
deleted file mode 100644
index 944cfd78..00000000
--- a/data/autostart/orca-autostart.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Orca screen reader
-Exec=orca --disable main-window,splash-window --enable speech,braille
-NoDisplay=true
-AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-reader-enabled
-X-GNOME-AutoRestart=true
diff --git a/data/gnome-login.session.in b/data/gnome-login.session.in
index 618e76ce..e4cd83e3 100644
--- a/data/gnome-login.session.in
+++ b/data/gnome-login.session.in
@@ -1,3 +1,4 @@
 [GNOME Session]
 Name=Display Manager
 RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;
+AutostartWhitelist=orca-autostart
\ No newline at end of file