From 2e21e6abb0cd759761dc8e98702b96e6b75d2246 Mon Sep 17 00:00:00 2001
From: Dan O'Reilly <oreilldf@gmail.com>
Date: Thu, 11 Dec 2008 18:42:11 -0500
Subject: [PATCH] Fix dbus permissions problem. Fix missing dbus import.

---
 other/wicd.conf | 8 --------
 wicd/monitor.py | 4 +++-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/other/wicd.conf b/other/wicd.conf
index 05ab9ab..4004de1 100755
--- a/other/wicd.conf
+++ b/other/wicd.conf
@@ -25,13 +25,5 @@
         </policy>
         <policy context="default">
                 <deny own="org.wicd.daemon"/>
-                <deny send_destination="org.wicd.daemon"/>
-                <deny send_interface="org.wicd.daemon"/>
-		<deny send_destination="org.wicd.daemon.wireless"/>
-		<deny send_interface="org.wicd.daemon.wireless"/>
-		<deny send_destination="org.wicd.daemon.wired"/>
-		<deny send_interface="org.wicd.daemon.wired"/>
-		<deny send_destination="org.wicd.daemon.config"/>
-		<deny send_interface="org.wicd.daemon.config"/>
         </policy>
 </busconfig>
diff --git a/wicd/monitor.py b/wicd/monitor.py
index 9f5be50..7153f9e 100755
--- a/wicd/monitor.py
+++ b/wicd/monitor.py
@@ -27,6 +27,8 @@ when appropriate.
 import gobject
 import time
 
+from dbus import DBusException
+
 from wicd import wpath
 from wicd import misc
 from wicd import dbusmanager
@@ -167,7 +169,7 @@ class ConnectionStatus(object):
                 from_wireless = False
                 self.auto_reconnect(from_wireless)
             self.update_state(state)
-        except dbus.exceptions.DBusException, e:
+        except DBusException, e:
             print 'Ignoring DBus Error: ' + str(e)
         return True