From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 30 Sep 2015 14:24:49 +0100
Subject: Add a systemd user unit corresponding to the D-Bus session service

This lets systemd put the service in its own cgroup, instead of
treating it as part of dbus.service.
---
 Makefile.am                                                   | 8 ++++++--
 xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in | 1 +
 xfce4-notifyd/xfce4-notifyd.service.in                        | 7 +++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 xfce4-notifyd/xfce4-notifyd.service.in

diff --git a/Makefile.am b/Makefile.am
index df81bea..82fcc44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,16 +70,20 @@ xfce4_notifyd_config_xfce4_notifyd_config_LDADD = \
 	$(common_ldadd) \
 	$(LIBNOTIFY_LIBS)
 
-
 servicedir = $(datadir)/dbus-1/services
 service_in_files = xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
+systemd_userdir = $(prefix)/lib/systemd/user
+systemd_user_in_files = xfce4-notifyd/xfce4-notifyd.service.in
+systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
+
 dist_service = \
 	$(service_in_files) \
+	$(systemd_user_in_files) \
 	xfce4-notifyd/notify-dbus.xml \
 	xfce4-notifyd/xfce-notify-marshal.list
-distclean_service = $(service_DATA)
+distclean_service = $(service_DATA) $(systemd_user_DATA)
 
 dist_man1_MANS = \
 	xfce4-notifyd-config/xfce4-notifyd-config.1
diff --git a/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in b/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
index 578a4b5..1e1fee7 100644
--- a/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
+++ b/xfce4-notifyd/org.xfce.xfce4-notifyd.Notifications.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.Notifications
 Exec=@notifydir@/xfce4-notifyd
+SystemdService=xfce4-notifyd.service
diff --git a/xfce4-notifyd/xfce4-notifyd.service.in b/xfce4-notifyd/xfce4-notifyd.service.in
new file mode 100644
index 0000000..5e4a0b1
--- /dev/null
+++ b/xfce4-notifyd/xfce4-notifyd.service.in
@@ -0,0 +1,7 @@
+[Unit]
+Description=XFCE notifications service
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.Notifications
+ExecStart=@notifydir@/xfce4-notifyd