From c3f0838047da8d2e7f9eb3b96008f0b07c91562c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 09:46:00 -0600
Subject: Drop the DBus service file

---
 data/Makefile.am                   | 9 ---------
 data/indicator-printers.service.in | 3 ---
 2 files changed, 12 deletions(-)
 delete mode 100644 data/indicator-printers.service.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 133a853..139597f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,2 @@
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-printers.service
-
-%.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-EXTRA_DIST = indicator-printers.service.in
-
-CLEANFILES = $(dbus_services_DATA)
 
diff --git a/data/indicator-printers.service.in b/data/indicator-printers.service.in
deleted file mode 100644
index d89bcd2..0000000
--- a/data/indicator-printers.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.printers
-Exec=@libexecdir@/indicator-printers-service
-- 
cgit v1.2.3


From 3bcbc85d8cda75d56101123ee9daf261b15c90fb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:04:19 -0600
Subject: Adding in XDG autostart and Upstart job files

---
 data/Makefile.am                   | 32 ++++++++++++++++++++++++++++++++
 data/indicator-printers.conf.in    |  9 +++++++++
 data/indicator-printers.desktop.in |  8 ++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 data/indicator-printers.conf.in
 create mode 100644 data/indicator-printers.desktop.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 139597f..de18ae7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,2 +1,34 @@
 
+BUILT_SOURCES=
+CLEANFILES=
+EXTRA_DIST=
+
+#SUBDIRS = upstart
+
+#
+# the upstart job file
+#
+
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-printers.conf
+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
+$(upstart_jobs_DATA): $(upstart_jobs_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_jobs_DATA)
+CLEANFILES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
+
+#
+# the xdg autostart job file
+#
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-printers.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+CLEANFILES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
+
 
diff --git a/data/indicator-printers.conf.in b/data/indicator-printers.conf.in
new file mode 100644
index 0000000..665fb35
--- /dev/null
+++ b/data/indicator-printers.conf.in
@@ -0,0 +1,9 @@
+description "Indicator Power Service"
+
+start on indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+respawn limit 2 10
+
+exec @pkglibexecdir@/indicator-power-service
diff --git a/data/indicator-printers.desktop.in b/data/indicator-printers.desktop.in
new file mode 100644
index 0000000..3b93d08
--- /dev/null
+++ b/data/indicator-printers.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Power
+Exec=@pkglibexecdir@/indicator-power-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
-- 
cgit v1.2.3


From d75744cc260d74e7ef010ca355b4051496a8ed9b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:06:20 -0600
Subject: Adding in Upstart XDG override

---
 data/upstart/Makefile.am                   | 17 +++++++++++++++++
 data/upstart/indicator-printers.desktop.in |  9 +++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 data/upstart/Makefile.am
 create mode 100644 data/upstart/indicator-printers.desktop.in

(limited to 'data')

diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 0000000..8eb41e9
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,17 @@
+BUILT_SOURCES=
+CLEANFILES=
+EXTRA_DIST=
+
+#
+# the upstart xdg autostart override
+#
+
+xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-printers.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+CLEANFILES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
+
diff --git a/data/upstart/indicator-printers.desktop.in b/data/upstart/indicator-printers.desktop.in
new file mode 100644
index 0000000..08ce2fa
--- /dev/null
+++ b/data/upstart/indicator-printers.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Power
+Exec=@pkglibexecdir@/indicator-power-service
+OnlyShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
-- 
cgit v1.2.3


From 45e7973d2a058819d6b563160cb2261667b40907 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:08:19 -0600
Subject: Cut and paste errors

---
 data/Makefile.am                           | 2 +-
 data/indicator-printers.conf.in            | 4 ++--
 data/indicator-printers.desktop.in         | 4 ++--
 data/upstart/indicator-printers.desktop.in | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index de18ae7..51ed2dd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@ BUILT_SOURCES=
 CLEANFILES=
 EXTRA_DIST=
 
-#SUBDIRS = upstart
+SUBDIRS = upstart
 
 #
 # the upstart job file
diff --git a/data/indicator-printers.conf.in b/data/indicator-printers.conf.in
index 665fb35..1bd4e65 100644
--- a/data/indicator-printers.conf.in
+++ b/data/indicator-printers.conf.in
@@ -1,4 +1,4 @@
-description "Indicator Power Service"
+description "Indicator Printers Service"
 
 start on indicator-services-start
 stop on desktop-end or indicator-services-end
@@ -6,4 +6,4 @@ stop on desktop-end or indicator-services-end
 respawn
 respawn limit 2 10
 
-exec @pkglibexecdir@/indicator-power-service
+exec @pkglibexecdir@/indicator-printers-service
diff --git a/data/indicator-printers.desktop.in b/data/indicator-printers.desktop.in
index 3b93d08..a4b6908 100644
--- a/data/indicator-printers.desktop.in
+++ b/data/indicator-printers.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Indicator Power
-Exec=@pkglibexecdir@/indicator-power-service
+Name=Indicator Printers
+Exec=@pkglibexecdir@/indicator-printers-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
diff --git a/data/upstart/indicator-printers.desktop.in b/data/upstart/indicator-printers.desktop.in
index 08ce2fa..8c011a9 100644
--- a/data/upstart/indicator-printers.desktop.in
+++ b/data/upstart/indicator-printers.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Indicator Power
-Exec=@pkglibexecdir@/indicator-power-service
+Name=Indicator Printers
+Exec=@pkglibexecdir@/indicator-printers-service
 OnlyShowIn=Unity;
 NoDisplay=true
 StartupNotify=false
-- 
cgit v1.2.3


From 329107ab34c4613ce4e59bb563762af53bc1287a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Feb 2014 10:59:28 -0600
Subject: Limit to Unity 7

---
 data/indicator-printers.conf.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/indicator-printers.conf.in b/data/indicator-printers.conf.in
index 1bd4e65..3e892fb 100644
--- a/data/indicator-printers.conf.in
+++ b/data/indicator-printers.conf.in
@@ -1,6 +1,9 @@
 description "Indicator Printers Service"
 
-start on indicator-services-start
+# 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 indicator-services-start and xsession SESSION=ubuntu
 stop on desktop-end or indicator-services-end
 
 respawn
-- 
cgit v1.2.3