[nanny: 3/13] Simplify dbus daemon configuration to make it work with non-admin users.

[Roberto Majadas <telemaco src gnome org>]

commit cd64eaace22a059dc48a6af875c58d7be88ff4dc
Author: Guido Tabbernuk <boamaod gmail com>
Date:   Thu Feb 23 15:00:18 2012 +0200

    Simplify dbus daemon configuration to make it work with non-admin users.

 daemon/data/dbus/nanny-daemon.conf |   40 ++++++++---------------------------
 1 files changed, 9 insertions(+), 31 deletions(-)
---
diff --git a/daemon/data/dbus/nanny-daemon.conf b/daemon/data/dbus/nanny-daemon.conf
index a86d9e0..4d0226d 100644
--- a/daemon/data/dbus/nanny-daemon.conf
+++ b/daemon/data/dbus/nanny-daemon.conf
@@ -2,44 +2,22 @@
  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";>
 <busconfig>
-  
-  <policy user="0">
-    <allow own="org.gnome.Nanny"/>
-    <allow send_destination="org.gnome.Nanny"/>
-
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny"/>
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny.Notification"/>
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny.WebDatabase"/>
-
-    
-    <allow receive_interface="org.gnome.Nanny" receive_sender="org.gnome.Nanny"/>
-    <allow receive_interface="org.gnome.Nanny.Notification" receive_sender="org.gnome.Nanny"/>
-    <allow receive_interface="org.gnome.Nanny.WebDatabase" receive_sender="org.gnome.Nanny"/>
-  </policy>
-
+ 
   <policy context="default">
     <deny own="org.gnome.Nanny"/>
-    <deny send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny"/>
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny.Notification"/>
-    <deny send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny.WebDatabase"/>
-    
-    
-    <deny receive_interface="org.gnome.Nanny" receive_sender="org.gnome.Nanny"/>
-    <allow receive_interface="org.gnome.Nanny.Notification" receive_sender="org.gnome.Nanny"/>
-    <deny receive_interface="org.gnome.Nanny.WebDatabase" receive_sender="org.gnome.Nanny"/>
+    <allow send_destination="org.gnome.Nanny"/>
+    <allow receive_sender="org.gnome.Nanny"/>
   </policy>
 
   <policy group="admin">
     <allow send_destination="org.gnome.Nanny"/>
+    <allow receive_sender="org.gnome.Nanny"/>
+  </policy>
 
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny"/>
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny.Notification"/>
-    <allow send_destination="org.gnome.Nanny" send_interface="org.gnome.Nanny.WebDatabase"/>
-
-    
-    <allow receive_interface="org.gnome.Nanny" receive_sender="org.gnome.Nanny"/>
-    <allow receive_interface="org.gnome.Nanny.Notification" receive_sender="org.gnome.Nanny"/>
-    <allow receive_interface="org.gnome.Nanny.WebDatabase" receive_sender="org.gnome.Nanny"/>
+  <policy user="0">
+    <allow own="org.gnome.Nanny"/>
+    <allow send_destination="org.gnome.Nanny"/>
+    <allow receive_sender="org.gnome.Nanny"/>
   </policy>
 
 </busconfig>