[Xfce4-commits] <tumbler:master> Rename D-Bus service file, add others for the cache and the manager.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to f9053a4334e1a8642ae31284c734052d0e206347 (commit)
       from e3995be157cf9c161f09ba24e07ac8ef92ca04ec (commit)

commit f9053a4334e1a8642ae31284c734052d0e206347
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Mon Oct 5 19:46:26 2009 +0200

    Rename D-Bus service file, add others for the cache and the manager.
    
    This finally fixes the D-Bus activation issues and starts tumblerd
    automatically e.g. when Thunar is started.

 tumblerd/Makefile.am                               |    6 +++++-
 ...service.in => org.xfce.TumblerCache.service.in} |    0
 ...rvice.in => org.xfce.TumblerManager.service.in} |    2 +-
 ...e.in => org.xfce.TumblerThumbnailer.service.in} |    0
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index aeaa0f9..75e4e91 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -73,7 +73,11 @@ tumblerd_LDADD =							\
 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
 
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.xfce.Tumbler.service.in
+service_in_files = 							\
+	org.xfce.TumblerCache.service.in				\
+	org.xfce.TumblerManager.service.in				\
+	org.xfce.TumblerThumbnailer.service.in
+
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.TumblerCache.service.in
similarity index 100%
copy from tumblerd/org.xfce.Tumbler.service.in
copy to tumblerd/org.xfce.TumblerCache.service.in
diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.TumblerManager.service.in
similarity index 53%
copy from tumblerd/org.xfce.Tumbler.service.in
copy to tumblerd/org.xfce.TumblerManager.service.in
index cdf8b8e..af2d536 100644
--- a/tumblerd/org.xfce.Tumbler.service.in
+++ b/tumblerd/org.xfce.TumblerManager.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.xfce.thumbnails.Thumbnailer
+Name=org.xfce.thumbnails.Manager
 Exec=@libexecdir@/tumblerd
diff --git a/tumblerd/org.xfce.Tumbler.service.in b/tumblerd/org.xfce.TumblerThumbnailer.service.in
similarity index 100%
rename from tumblerd/org.xfce.Tumbler.service.in
rename to tumblerd/org.xfce.TumblerThumbnailer.service.in