5 files changed, 28 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 77ec71d..b26a669 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,15 +1,17 @@
 
+SUBDIRS = upstart
+
 upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-application.conf
 
 %.conf: %.conf.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 xdg_autostartdir = /etc/xdg/autostart
 xdg_autostart_DATA = indicator-application.desktop
 
 %.desktop: %.desktop.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
@@ -20,5 +22,6 @@ EXTRA_DIST = \
 	ordering-override.keyfile
 
 CLEANFILES = \
-	indicator-application.conf
+	indicator-application.conf \
+	indicator-application.desktop
 
diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in
index ddc803c..d3a103d 100644
--- a/data/indicator-application.conf.in
+++ b/data/indicator-application.conf.in
@@ -3,13 +3,14 @@ description "Indicator Application Service"
 # NOTE: Limiting only to Unity 7 right now as it's still using
 # dbusmenu.  That can be lifted after it is ported to GMenu
 
-start on (indicators-loaded or indicator-services-start) and xsession SESSION=ubuntu
+start on indicator-services-start and xsession SESSION=ubuntu
 stop on desktop-end or indicator-services-end
 
 emits appindicators-start appindicators-end
 
 respawn
+respawn limit 2 10
 
-exec @libexecdir@/indicator-application-service
+exec @pkglibexecdir@/indicator-application-service
 
 pre-stop exec initctl emit appindicators-end
diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in
index 61d3c4d..c724a0f 100644
--- a/data/indicator-application.desktop.in
+++ b/data/indicator-application.desktop.in
@@ -1,9 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
-NotShowIn=Unity;
-NoDisplay=true
+Exec=@pkglibexecdir@/indicator-application-service
 StartupNotify=false
 Terminal=false
-
+OnlyShowIn=Unity;XFCE;
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 0000000..f7bc09e
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,9 @@
+
+xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-application.desktop
+
+%.desktop: %.desktop.in
+	sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@
+
+EXTRA_DIST = \
+	indicator-application.desktop.in
diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in
new file mode 100644
index 0000000..f4ba076
--- /dev/null
+++ b/data/upstart/indicator-application.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Application
+Exec=@pkglibexecdir@/indicator-application-service
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;XFCE;
+Hidden=true