From 250ceaa18561fe25046176a33617c85ec0700b3c Mon Sep 17 00:00:00 2001
From: Alexander Schwinn <alexxcons@xfce.org>
Date: Sun, 27 Jan 2019 21:13:04 +0100
Subject: renamed org.freedesktop.FileManager1.service.in to 
 org.xfce.Thunar.FileManager1.service.in to avoid name clashes  (Bug #12414)

---
 Makefile.am                             | 2 +-
 org.freedesktop.FileManager1.service.in | 4 ----
 org.xfce.Thunar.FileManager1.service.in | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 org.freedesktop.FileManager1.service.in
 create mode 100644 org.xfce.Thunar.FileManager1.service.in

diff --git a/Makefile.am b/Makefile.am
index bd2a6e96..cb2db7a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,7 @@ appdata_in_files = org.xfce.thunar.appdata.xml.in
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.FileManager.service.in	\
 	org.xfce.Thunar.service.in						\
-	org.freedesktop.FileManager1.service.in
+	org.xfce.Thunar.FileManager1.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 systemd_userdir = $(prefix)/lib/systemd/user
diff --git a/org.freedesktop.FileManager1.service.in b/org.freedesktop.FileManager1.service.in
deleted file mode 100644
index e0b3fade..00000000
--- a/org.freedesktop.FileManager1.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.FileManager1
-Exec=@bindir@/Thunar --gapplication-service
-SystemdService=thunar.service
diff --git a/org.xfce.Thunar.FileManager1.service.in b/org.xfce.Thunar.FileManager1.service.in
new file mode 100644
index 00000000..e0b3fade
--- /dev/null
+++ b/org.xfce.Thunar.FileManager1.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.FileManager1
+Exec=@bindir@/Thunar --gapplication-service
+SystemdService=thunar.service
-- 
cgit v1.2.1