Merged r250 of mainline.

wicd/autoconnect.py

@@ -49,7 +49,7 @@ def error_handler(*args):
 if __name__ == '__main__':
     try:
         time.sleep(2)
-        wireless.Scan()
+        wireless.Scan(True)
         daemon.SetSuspend(False)
         if not daemon.CheckIfConnecting():
             daemon.AutoConnect(True, reply_handler=handler, error_handler=handler)

wicd/wicd-daemon.py

@@ -520,7 +520,7 @@ class WicdDaemon(dbus.service.Object):
     @dbus.service.method('org.wicd.daemon')
     def SetPreferWiredNetwork(self, value):
         """ Sets the prefer_wired state. """
-        self.prefer_wired = value
+        self.prefer_wired = bool(value)
     
     @dbus.service.method('org.wicd.daemon')
     def SetConnectionStatus(self, state, info):
@@ -925,6 +925,9 @@ class WirelessDaemon(dbus.service.Object):
         Scans for wireless networks, optionally using a (hidden) essid
         set with SetHiddenNetworkESSID.
         
+        The sync keyword argument specifies whether the scan should
+        be done synchronously.
+        
         """
         if self.debug_mode:
             print 'scanning start'