From 7c5541f64c95649eb48d5720de43dc3f69bc7168 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 10 Aug 2020 12:17:49 +0200
Subject: Drop all references to upstart.

---
 data/Makefile.am                        | 8 --------
 data/ayatana-indicator-messages.conf.in | 9 ---------
 2 files changed, 17 deletions(-)
 delete mode 100644 data/ayatana-indicator-messages.conf.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 60dd839..ff45ba2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,12 +6,6 @@ xdg_autostart_DATA = ayatana-indicator-messages.desktop
 %.desktop: %.desktop.in
 	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
-upstart_jobsdir = $(datadir)/upstart/sessions/
-upstart_jobs_DATA = ayatana-indicator-messages.conf
-
-%.conf: %.conf.in
-	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
 gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
 
@@ -20,9 +14,7 @@ dist_indicator_DATA = org.ayatana.indicator.messages
 
 EXTRA_DIST = \
 	ayatana-indicator-messages.desktop.in \
-	ayatana-indicator-messages.conf.in \
 	$(gsettings_SCHEMAS)
 
 CLEANFILES = \
 	$(xdg_autostart_DATA) \
-	$(upstart_jobs_DATA)
diff --git a/data/ayatana-indicator-messages.conf.in b/data/ayatana-indicator-messages.conf.in
deleted file mode 100644
index ed7a4b6..0000000
--- a/data/ayatana-indicator-messages.conf.in
+++ /dev/null
@@ -1,9 +0,0 @@
-description "Ayatana Indicator Messages Service"
-
-start on ayatana-indicator-services-start
-stop on desktop-end or ayatana-indicator-services-end
-
-respawn
-respawn limit 2 10
-
-exec $SNAP@pkglibexecdir@/ayatana-indicator-messages-service
-- 
cgit v1.2.3


From cae7f2e16061571e6ababb4e1782d52dcac6e50b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 10 Aug 2020 13:14:06 +0200
Subject: Start indicator in systemd when ayatana-indicators.target is started.

Fixes AyatanaIndicators/ayatana-indicator-messages#10.
---
 data/Makefile.am                           | 17 ++++++++++++++++-
 data/ayatana-indicator-messages.service.in | 11 +++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 data/ayatana-indicator-messages.service.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index ff45ba2..b88aee5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 SUBDIRS = icons
 
 xdg_autostartdir = /etc/xdg/autostart
@@ -9,12 +11,25 @@ xdg_autostart_DATA = ayatana-indicator-messages.desktop
 gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
 
+#if defined(HAVE_SYSTEMD)
+systemdservice_file = ayatana-indicator-messages.service
+$(systemdservice_file): $(systemdservice_file).in
+	$(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+
+systemddir = $(SYSTEMD_USERDIR)
+systemd_DATA = $(systemdservice_file)
+#endif
+
 indicatordir = $(INDICATOR_DIR)
 dist_indicator_DATA = org.ayatana.indicator.messages
 
 EXTRA_DIST = \
 	ayatana-indicator-messages.desktop.in \
-	$(gsettings_SCHEMAS)
+	$(gsettings_SCHEMAS) \
+	$(systemdservice_file).in \
+	$(NULL)
 
 CLEANFILES = \
 	$(xdg_autostart_DATA) \
+	$(systemdservice_file) \
+	$(NULL)
diff --git a/data/ayatana-indicator-messages.service.in b/data/ayatana-indicator-messages.service.in
new file mode 100644
index 0000000..a0a3ba0
--- /dev/null
+++ b/data/ayatana-indicator-messages.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=Ayatana Indicator Messages Service
+PartOf=graphical-session.target
+PartOf=ayatana-indicators.target
+
+[Service]
+ExecStart=@pkglibexecdir@/ayatana-indicator-messages-service
+Restart=on-failure
+
+[Install]
+WantedBy=ayatana-indicators.target
-- 
cgit v1.2.3