From 667bae7b6050a2346046a8482dd2bd758025fa00 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 27 Aug 2013 11:46:32 -0500
Subject: Switching the dvus service to an upstart job

---
 data/Makefile.am                | 16 ++++++++--------
 data/indicator-power.conf.in    | 14 ++++++++++++++
 data/indicator-power.service.in |  3 ---
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 data/indicator-power.conf.in
 delete mode 100644 data/indicator-power.service.in

diff --git a/data/Makefile.am b/data/Makefile.am
index 68cd662..9aed4e3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,17 +10,17 @@ indicatorsdir = $(prefix)/share/unity/indicators
 dist_indicators_DATA = com.canonical.indicator.power
 
 #
-# the dbus service file
+# the upstart job file
 #
 
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-power.service
-dbus_services_in = $(dbus_services_DATA:.service=.service.in)
-$(dbus_services_DATA): $(dbus_services_in)
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-power.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 += $(dbus_services_DATA)
-CLEANFILES += $(dbus_services_DATA)
-EXTRA_DIST += $(dbus_services_in)
+BUILT_SOURCES += $(upstart_jobs_DATA)
+CLEANFILES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
 
 #
 # the gettings
diff --git a/data/indicator-power.conf.in b/data/indicator-power.conf.in
new file mode 100644
index 0000000..327e9f3
--- /dev/null
+++ b/data/indicator-power.conf.in
@@ -0,0 +1,14 @@
+description "Indicator Power Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet.  Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+env G_MESSAGES_DEBUG=all
+export G_MESSAGES_DEBUG
+
+respawn
+
+exec @pkglibexecdir@/indicator-power-service
diff --git a/data/indicator-power.service.in b/data/indicator-power.service.in
deleted file mode 100644
index 0702e8b..0000000
--- a/data/indicator-power.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.power
-Exec=@pkglibexecdir@/indicator-power-service
-- 
cgit v1.2.3


From 812ac9a18c469c7a4ad60cd7bb1921eb622d7df9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 27 Aug 2013 15:12:36 -0500
Subject: Dropping debugging for system-wide support

---
 data/indicator-power.conf.in | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/indicator-power.conf.in b/data/indicator-power.conf.in
index 327e9f3..a2bc7aa 100644
--- a/data/indicator-power.conf.in
+++ b/data/indicator-power.conf.in
@@ -6,9 +6,6 @@ description "Indicator Power Backend"
 start on indicators-loaded or indicator-services-start
 stop on desktop-end or indicator-services-end
 
-env G_MESSAGES_DEBUG=all
-export G_MESSAGES_DEBUG
-
 respawn
 
 exec @pkglibexecdir@/indicator-power-service
-- 
cgit v1.2.3


From 4913289a34ce6088ec06d7f32a55f0638e4c2da5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 29 Oct 2013 09:29:22 -0700
Subject: Add in the autostart config

---
 data/Makefile.am                | 13 +++++++++++++
 data/indicator-power.desktop.in |  9 +++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 data/indicator-power.desktop.in

diff --git a/data/Makefile.am b/data/Makefile.am
index 9aed4e3..9a4caca 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,6 +22,19 @@ 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-power.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)
+
 #
 # the gettings
 #
diff --git a/data/indicator-power.desktop.in b/data/indicator-power.desktop.in
new file mode 100644
index 0000000..28025a2
--- /dev/null
+++ b/data/indicator-power.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Power
+Exec=@pkglibexecdir@/indicator-power-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+
-- 
cgit v1.2.3