Add an autostart file for orca

Add an autostart file for orca, and install it in
/usr/share/gdm/greeter/autostart.

This is necessary to make the screen reader switch in
the a11y menu work in the login screen.

https://bugzilla.gnome.org/show_bug.cgi?id=684474

6 files changed, 22 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 79aad206..b39f3ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1544,6 +1544,7 @@ utils/Makefile
 data/gdm.conf
 data/Makefile
 data/applications/Makefile
+data/autostart/Makefile
 data/pixmaps/Makefile
 data/pixmaps/16x16/Makefile
 data/pixmaps/32x32/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 52d4a7d9..794cd458 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST =
 
 SUBDIRS =			\
 	applications		\
+	autostart		\
 	pixmaps			\
 	$(NULL)
 
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
index cf4ecfa7..1c81e058 100644
--- a/data/applications/Makefile.am
+++ b/data/applications/Makefile.am
@@ -18,7 +18,6 @@ desktop_in_files = 							\
 	gnome-shell.desktop.in						\
 	gnome-mag.desktop.in						\
 	gok.desktop.in							\
-	orca-screen-reader.desktop.in					\
 	polkit-gnome-authentication-agent-1.desktop.in			\
 	$(NULL)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)			\
diff --git a/data/applications/orca-screen-reader.desktop.in b/data/applications/orca-screen-reader.desktop.in
deleted file mode 100644
index 405dca95..00000000
--- a/data/applications/orca-screen-reader.desktop.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Orca Screen Reader
-_Comment=Present on-screen information as speech or braille
-TryExec=orca
-Exec=orca --no-setup --disable main-window --disable splash-window --disable magnifier --enable speech --enable braille
-Icon=orca
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Accessibility;
-AutostartCondition=GNOME /desktop/gnome/applications/at/screen_reader_enabled
-X-GNOME-Provides=screen-reader
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=orca
-X-GNOME-Bugzilla-Component=general
diff --git a/data/autostart/Makefile.am b/data/autostart/Makefile.am
new file mode 100644
index 00000000..fa7d1e83
--- /dev/null
+++ b/data/autostart/Makefile.am
@@ -0,0 +1,13 @@
+NULL =
+
+desktopdir = $(pkgdatadir)/greeter/autostart
+desktop_DATA = orca-autostart.desktop					\
+	       $(NULL)
+
+EXTRA_DIST =								\
+	$(desktop_DATA)							\
+	$(NULL)
+
+MAINTAINERCLEANFILES =                  				\
+        *~                              				\
+        Makefile.in
diff --git a/data/autostart/orca-autostart.desktop b/data/autostart/orca-autostart.desktop
new file mode 100644
index 00000000..944cfd78
--- /dev/null
+++ b/data/autostart/orca-autostart.desktop
@@ -0,0 +1,7 @@
+[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