From 477cf6ad04b73e4d448abc6925cdb328d63521c3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 29 May 2013 11:18:05 -0500
Subject: Adding an upstart job configuration

---
 data/Makefile.am | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index c142c4e..12ee39c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,13 +5,21 @@ dbus_services_DATA = indicator-application.service
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
+upstart_jobsdir = $(datadir)/upstart/sessions/
+upstart_jobs_DATA = indicator-application.conf
+
+%.conf: %.conf.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
 
 EXTRA_DIST = \
 	indicator-application.service.in \
+	indicator-application.conf.in \
 	ordering-override.keyfile
 
 CLEANFILES = \
-	indicator-application.service
+	indicator-application.service \
+	indicator-application.conf
 
-- 
cgit v1.2.3


From a6999f41b1da373b48e897d8fbd218617a5fefa2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 29 May 2013 11:43:45 -0500
Subject: Dropping the dbus service file

---
 configure.ac                          | 11 -----------
 data/Makefile.am                      |  6 ------
 data/indicator-application.service.in |  3 ---
 3 files changed, 20 deletions(-)
 delete mode 100644 data/indicator-application.service.in

(limited to 'data/Makefile.am')

diff --git a/configure.ac b/configure.ac
index 1cc1811..2d1ccc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,17 +88,6 @@ fi
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
 ###########################
 # Files
 ###########################
diff --git a/data/Makefile.am b/data/Makefile.am
index 12ee39c..85cb9c0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,4 @@
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-application.service
-
-%.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
 upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-application.conf
 
diff --git a/data/indicator-application.service.in b/data/indicator-application.service.in
deleted file mode 100644
index f6ceee3..0000000
--- a/data/indicator-application.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.application
-Exec=@libexecdir@/indicator-application-service
-- 
cgit v1.2.3


From 634e24e0a367100f76bd4701f27d54aaf53d7732 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 29 May 2013 14:23:35 -0500
Subject: Dropping service from extra dist and clean

---
 data/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 85cb9c0..c6e82b2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,11 +9,9 @@ overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
 
 EXTRA_DIST = \
-	indicator-application.service.in \
 	indicator-application.conf.in \
 	ordering-override.keyfile
 
 CLEANFILES = \
-	indicator-application.service \
 	indicator-application.conf
 
-- 
cgit v1.2.3


From 96efd3b86974e72d1c23a328e6892cacefc79e8c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 28 Oct 2013 17:01:19 -0700
Subject: Adding an XDG Autostart file

---
 .bzrignore                            | 1 +
 data/Makefile.am                      | 7 +++++++
 data/indicator-application.desktop.in | 9 +++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 data/indicator-application.desktop.in

(limited to 'data/Makefile.am')

diff --git a/.bzrignore b/.bzrignore
index 618ca76..317a187 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -111,3 +111,4 @@ bindings/mono/policy.0.0.appindicator-sharp.dll
 src/libapplication_la-generate-id.lo
 src/libappindicator_la-generate-id.lo
 indicator-application.conf
+indicator-application.desktop
diff --git a/data/Makefile.am b/data/Makefile.am
index c6e82b2..77ec71d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,10 +5,17 @@ upstart_jobs_DATA = indicator-application.conf
 %.conf: %.conf.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-application.desktop
+
+%.desktop: %.desktop.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
 overridedir = $(pkgdatadir)
 override_DATA = ordering-override.keyfile
 
 EXTRA_DIST = \
+	indicator-application.desktop.in \
 	indicator-application.conf.in \
 	ordering-override.keyfile
 
diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in
new file mode 100644
index 0000000..61d3c4d
--- /dev/null
+++ b/data/indicator-application.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Application
+Exec=@libexecdir@/indicator-application-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+
-- 
cgit v1.2.3