>From 2879f37c7f228a8ffdb209c95019b7e27ead02a2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 13 May 2008 17:40:01 +0100
Subject: [PATCH] D-Bus activation, pass 2

---
 data/Makefile.am                       |    8 ++++----
 data/net.reactivated.Fprint.conf       |    8 +-------
 data/net.reactivated.Fprint.service.in |    4 ++--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index bfb0e8c..0243423 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,15 +1,15 @@
 
 dbus_servicesdir = $(datadir)/dbus-1/system-services
 dbus_confdir = $(sysconfdir)/dbus-1/system.d
-•
-dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
 
-dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)•
+dbus_services_in_files = net.reactivated.Fprint.service.in
+
+dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
 
 $(dbus_services_DATA): $(dbus_services_in_files)
 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
-dbus_conf_DATA = org.gnome.ClockApplet.Mechanism.conf
+dbus_conf_DATA = net.reactivated.Fprint.conf
 
 
 
diff --git a/data/net.reactivated.Fprint.conf b/data/net.reactivated.Fprint.conf
index 4cd5373..dabefa0 100644
--- a/data/net.reactivated.Fprint.conf
+++ b/data/net.reactivated.Fprint.conf
@@ -7,13 +7,7 @@
 
   <!-- Only root can own the service -->
   <policy user="root">
-    <allow own="net.reactivated.Fprint.Manager"/>
-    <allow send_interface="net.reactivated.Fprint.Manager.GetDevices"/>
-  </policy>
-
-  <!-- Allow anyone to invoke methods on the interfaces -->
-  <policy context="default">
-    <allow send_interface="net.reactivated.Fprint.Manager.GetDevices"/>
+    <allow own="net.reactivated.Fprint"/>
   </policy>
 
 </busconfig>
diff --git a/data/net.reactivated.Fprint.service.in b/data/net.reactivated.Fprint.service.in
index a838d03..a191a0a 100644
--- a/data/net.reactivated.Fprint.service.in
+++ b/data/net.reactivated.Fprint.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=net.reactivated.Fprint.Manager
-Exec=@LIBEXEC@/fprintd
+Name=net.reactivated.Fprint
+Exec=@LIBEXECDIR@/fprintd
 User=root
-- 
1.5.4.5