mirror of
https://github.com/gryf/wicd.git
synced 2026-01-06 13:54:17 +01:00
Merged r250 of mainline.
This commit is contained in:
@@ -49,7 +49,7 @@ def error_handler(*args):
|
|||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
try:
|
try:
|
||||||
time.sleep(2)
|
time.sleep(2)
|
||||||
wireless.Scan()
|
wireless.Scan(True)
|
||||||
daemon.SetSuspend(False)
|
daemon.SetSuspend(False)
|
||||||
if not daemon.CheckIfConnecting():
|
if not daemon.CheckIfConnecting():
|
||||||
daemon.AutoConnect(True, reply_handler=handler, error_handler=handler)
|
daemon.AutoConnect(True, reply_handler=handler, error_handler=handler)
|
||||||
|
|||||||
@@ -520,7 +520,7 @@ class WicdDaemon(dbus.service.Object):
|
|||||||
@dbus.service.method('org.wicd.daemon')
|
@dbus.service.method('org.wicd.daemon')
|
||||||
def SetPreferWiredNetwork(self, value):
|
def SetPreferWiredNetwork(self, value):
|
||||||
""" Sets the prefer_wired state. """
|
""" Sets the prefer_wired state. """
|
||||||
self.prefer_wired = value
|
self.prefer_wired = bool(value)
|
||||||
|
|
||||||
@dbus.service.method('org.wicd.daemon')
|
@dbus.service.method('org.wicd.daemon')
|
||||||
def SetConnectionStatus(self, state, info):
|
def SetConnectionStatus(self, state, info):
|
||||||
@@ -925,6 +925,9 @@ class WirelessDaemon(dbus.service.Object):
|
|||||||
Scans for wireless networks, optionally using a (hidden) essid
|
Scans for wireless networks, optionally using a (hidden) essid
|
||||||
set with SetHiddenNetworkESSID.
|
set with SetHiddenNetworkESSID.
|
||||||
|
|
||||||
|
The sync keyword argument specifies whether the scan should
|
||||||
|
be done synchronously.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
if self.debug_mode:
|
if self.debug_mode:
|
||||||
print 'scanning start'
|
print 'scanning start'
|
||||||
|
|||||||
Reference in New Issue
Block a user