diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-20 14:36:47 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-08-20 14:37:00 +0200 |
| commit | ed884c084a013586ce5abcc53457bd617fd68f42 (patch) | |
| tree | aa168ecb5b044c8a572e289c1a33bfb0c3cb8ff1 | |
| parent | b03aa691dd7dd19ea4b1a33d7b30982c5dce75aa (diff) | |
| download | ayatana-indicator-notifications-ed884c084a013586ce5abcc53457bd617fd68f42.tar.gz ayatana-indicator-notifications-ed884c084a013586ce5abcc53457bd617fd68f42.tar.bz2 ayatana-indicator-notifications-ed884c084a013586ce5abcc53457bd617fd68f42.zip | |
Revert "Start indicator in systemd when ayatana-indicators.target is started."
This reverts commit 8189b651e2ab4b22fb2c471e8436e93cb914a49b.
The notifications indicator is an old-style indicator (non-NG). So
no need for a systemd service file starting up a service. The indicator
gets side-loaded into the indicator-applet via libayatana-indicator.
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | data/Makefile.am | 19 | ||||
| -rw-r--r-- | data/ayatana-indicator-notifications.service.in | 11 |
3 files changed, 2 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac index 868fa81..7a995c4 100644 --- a/configure.ac +++ b/configure.ac @@ -65,19 +65,6 @@ PKG_CHECK_MODULES(SETTINGS, gtk+-3.0 >= GTK3_REQUIRED_VERSION) AC_SUBST(SETTINGS_CFLAGS) AC_SUBST(SETTINGS_LIBS) -######################### -# Check for systemd -######################### -PKG_CHECK_MODULES(SYSTEMD, systemd, - [has_systemd=yes], - [] -) -if test "x$has_systemd" = "xyes"; then - SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd` - AC_SUBST(SYSTEMD_USERDIR) - AC_DEFINE(HAVE_SYSTEMD, 1, [create ayatana-indicator-application.service for systemd]) -fi - AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([ Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 52f61a7..1960ad7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,3 @@ -NULL = - SUBDIRS = icons gsettings_file = org.ayatana.indicator.notifications.gschema.xml @@ -14,23 +12,10 @@ $(gsettings_file).in: $(gsettings_file).in.in @GSETTINGS_RULES@ -#if defined(HAVE_SYSTEMD) -systemdservice_file = ayatana-indicator-notifications.service -$(systemdservice_file): $(systemdservice_file).in - $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -systemddir = $(SYSTEMD_USERDIR) -systemd_DATA = $(systemdservice_file) -#endif - EXTRA_DIST = \ - $(gsettings_file).in.in \ - $(systemdservice_file).in \ - $(NULL) + $(gsettings_file).in.in CLEANFILES = \ $(gsettings_file) \ $(gsettings_file).in \ - *.gschema.valid \ - $(systemdservice_file) \ - $(NULL) + *.gschema.valid diff --git a/data/ayatana-indicator-notifications.service.in b/data/ayatana-indicator-notifications.service.in deleted file mode 100644 index d356f01..0000000 --- a/data/ayatana-indicator-notifications.service.in +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Ayatana Indicator Notifications Service -PartOf=graphical-session.target -After=ayatana-indicators.target - -[Service] -ExecStart=@pkglibexecdir@/ayatana-indicator-notifications-service -Restart=on-failure - -[Install] -WantedBy=ayatana-indicators.target |