1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-22 05:48:03 +01:00

Merge changes from main experimental branch.

This commit is contained in:
Robby Workman
2008-12-12 14:05:44 +00:00
2 changed files with 3 additions and 9 deletions

View File

@@ -25,13 +25,5 @@
</policy> </policy>
<policy context="default"> <policy context="default">
<deny own="org.wicd.daemon"/> <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> </policy>
</busconfig> </busconfig>

View File

@@ -27,6 +27,8 @@ when appropriate.
import gobject import gobject
import time import time
from dbus import DBusException
from wicd import wpath from wicd import wpath
from wicd import misc from wicd import misc
from wicd import dbusmanager from wicd import dbusmanager
@@ -167,7 +169,7 @@ class ConnectionStatus(object):
from_wireless = False from_wireless = False
self.auto_reconnect(from_wireless) self.auto_reconnect(from_wireless)
self.update_state(state) self.update_state(state)
except dbus.exceptions.DBusException, e: except DBusException, e:
print 'Ignoring DBus Error: ' + str(e) print 'Ignoring DBus Error: ' + str(e)
return True return True