From 957fff5be2b3cb2a3356955f5c51c94bcd256fed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 22 Sep 2015 20:14:40 +0100 Subject: Use conventional naming for D-Bus session services This naming is mandatory for the system bus, but is also recommended for the session bus. The D-Bus maintainers recommend that all activatable session services' service files are named according to the bus name, so that any conflict is resolved in a deterministic way. If the services are in different directories (precedence levels) the result is the same as it is now: the higher precedence "wins". If the services are in the same directory, either one overwrites the other and consistently "wins", or a packaging system like dpkg prevents co-installation. If the service files were named differently, it would be possible to have two implementations for the same name. dbus-daemon resolves this by choosing one arbitrarily, not necessarily the same one every time. systemd's kdbus support is more strict (or less concerned with backwards compatibility), and treats this situation as an error. Bug: https://bugzilla.gnome.org/show_bug.cgi?id=755760 --- metadata/Makefile.am | 10 ++++------ metadata/gvfs-metadata.service.in | 3 --- metadata/org.gtk.vfs.Metadata.service.in | 3 +++ 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 metadata/gvfs-metadata.service.in create mode 100644 metadata/org.gtk.vfs.Metadata.service.in (limited to 'metadata') diff --git a/metadata/Makefile.am b/metadata/Makefile.am index 905e8057..9490cd6c 100644 --- a/metadata/Makefile.am +++ b/metadata/Makefile.am @@ -69,17 +69,15 @@ gvfsd_metadata_CFLAFGS = $(UDEV_CFLAGS) $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ servicedir = $(DBUS_SERVICE_DIR) -service_in_files = gvfs-metadata.service.in -service_DATA = gvfs-metadata.service +service_in_files = org.gtk.vfs.Metadata.service.in +service_DATA = org.gtk.vfs.Metadata.service EXTRA_DIST = \ - gvfs-metadata.service.in \ + $(service_in_files) \ dbus-interface.xml \ $(NULL) -clean-local: - rm -f gvfs-metadata.service - CLEANFILES = \ $(dbus_built_sources) \ + $(service_DATA) \ $(NULL) diff --git a/metadata/gvfs-metadata.service.in b/metadata/gvfs-metadata.service.in deleted file mode 100644 index 98932371..00000000 --- a/metadata/gvfs-metadata.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.gtk.vfs.Metadata -Exec=@libexecdir@/gvfsd-metadata diff --git a/metadata/org.gtk.vfs.Metadata.service.in b/metadata/org.gtk.vfs.Metadata.service.in new file mode 100644 index 00000000..98932371 --- /dev/null +++ b/metadata/org.gtk.vfs.Metadata.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gtk.vfs.Metadata +Exec=@libexecdir@/gvfsd-metadata -- cgit v1.2.1