diff options
| author | William Jon McCann <jmccann@redhat.com> | 2011-03-21 00:46:41 (GMT) |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2011-03-21 00:47:20 (GMT) |
| commit | 3365eec74643773d8d5aa92901b39bdc9496e19b (patch) | |
| tree | 390fdc6d896c2ceaa4f1abb6da45bc1b49a0fa5d | |
| parent | 8236a6c866a2e1f2b98213819c8276dfaa5e6e52 (diff) | |
| download | gnome-screensaver-3365eec74643773d8d5aa92901b39bdc9496e19b.zip gnome-screensaver-3365eec74643773d8d5aa92901b39bdc9496e19b.tar.xz | |
Remove dbus service activation file
The screensaver uses the session autostart mechanism now.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/org.gnome.ScreenSaver.service.in | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index a34b2ed..02aebe5 100644 --- a/configure.ac +++ b/configure.ac @@ -144,11 +144,6 @@ else AC_SUBST(DBUS_CFLAGS) fi -# Find out where the session service file goes -# The sad sed hack is recomended by section 27.10 of the automake manual. -DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'` -AC_SUBST(DBUS_SESSION_SERVICE_DIR) - # Desktop entry handling PKG_CHECK_MODULES(LIB_GNOME_MENU, @@ -704,7 +699,6 @@ src/Makefile src/gnome-screensaver.desktop.in data/Makefile data/gnome-screensaver.pc -data/org.gnome.ScreenSaver.service doc/Makefile doc/gnome-screensaver.xml ]) diff --git a/data/Makefile.am b/data/Makefile.am index c6493ed..dbf4767 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,14 +10,10 @@ man_MANS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-screensaver.pc -dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR) -dbussessionservice_DATA = org.gnome.ScreenSaver.service - EXTRA_DIST = \ $(man_MANS) \ gnome-screensaver \ gnome-screensaver.pc.in \ - org.gnome.ScreenSaver.service.in\ $(NULL) DISTCLEANFILES = \ diff --git a/data/org.gnome.ScreenSaver.service.in b/data/org.gnome.ScreenSaver.service.in deleted file mode 100644 index d46e4f4..0000000 --- a/data/org.gnome.ScreenSaver.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.gnome.ScreenSaver -Exec=@EXPANDED_BINDIR@/gnome-screensaver --no-daemon |