Merged r232 from mainline.

wicd/backends/be-ioctl.py

@@ -49,7 +49,7 @@ import array
 
 NAME = "ioctl"
 UPDATE_INTERVAL = 4
-DESCRIPTION = """IOCTL (new) backend
+DESCRIPTION = """IOCTL (experimental) backend
 
 This backend uses IOCTL calls and python libraries to query
 network information whenever possible.  This makes it fast,

wicd/gui.py

@@ -738,7 +738,7 @@ class appGui(object):
         self._save_gen_settings(entry)
         entry.set_net_prop("automatic",
                            noneToString(netent.chkbox_autoconnect.get_active()))
-            
+        
         if entry.chkbox_global_settings.get_active():
             entry.set_net_prop('use_settings_globally', True)
         else:

wicd/networking.py

@@ -780,7 +780,7 @@ class WirelessConnectThread(ConnectThread):
         # cards).
         if self.debug:
             print "enctype is %s" % self.network.get('enctype')
-        if self.network.get('key') and 'wpa' in self.network.get('enctype'):
+        if self.network.get('key') and 'wpa' in str(self.network.get('enctype')):
             self.SetStatus('generating_psk')
             print 'Generating psk...'
             self.network['psk'] = wiface.GeneratePSK(self.network)

wicd/wicd-daemon.py

@@ -104,7 +104,7 @@ class WicdDaemon(dbus.service.Object):
         # This will speed up the scanning process - if a client doesn't 
         # need a fresh scan, just feed them the old one.  A fresh scan
         # can be done by calling Scan(fresh=True).
-        self.LastScan = ''
+        self.LastScan = []
         
         signal.signal(signal.SIGTERM, self.DaemonClosing)
         self.DaemonStarting()