Merged r355 of mainline 1.6.

in/man=wicd-curses.8.in

@@ -1,5 +1,5 @@
 .\" First revision was r203
-.TH WICD-CURSES "8" "February 2009" "wicd-curses-%CURSES_REVNO%"
+.TH WICD-CURSES "8" "April 2009" "wicd-curses-%CURSES_REVNO%"
 .SH NAME
 .B wicd-curses
 \- curses-based wicd(8) controller
@@ -23,7 +23,7 @@ language of choice only uses Latin characters.
 .SH CONTROLS
 All of these are case sensitive.
 .TP
-.BR enter
+.BR "C " or " enter"
 Connect to selected network
 .TP
 .BR "F8 " or " Q " or " q"
@@ -52,7 +52,7 @@ Raise the "About wicd-curses" dialog
 .\".PP
 .\"The following is a work in progress and might not be fully functional as of yet.
 .TP
-.BR "C " or "enter"
+.BR "right-arrow"
 Bring up network configuration controller for the selected network
 .TP
 .BR delete

man/wicd-client.1

@@ -1,4 +1,4 @@
-.TH WICD-CLIENT "1" "September 2008" "wicd-client " "User Commands"
+.TH WICD-CLIENT "1" "February 2009" "wicd-client " "User Commands"
 .SH NAME
 wicd-client \- manual page for wicd-client 
 .SH DESCRIPTION

setup.cfg

@@ -1,2 +1,4 @@
 [install]
 record = install.log
+[bdist_rpm]
+group = Productivity/Networking/System

setup.py

@@ -492,7 +492,7 @@ Wicd supports wired and wireless networks, and capable of
 creating and tracking profiles for both.  It has a 
 template-based wireless encryption system, which allows the user
 to easily add encryption methods used.  It ships with some common
-encryption types, such as WPA and WEP. Wicdl will automatically
+encryption types, such as WPA and WEP. Wicd will automatically
 connect at startup to any preferred network within range.
 """,
       author="Adam Blackburn, Dan O'Reilly, Andrew Psaltis",

wicd/backends/be-ioctl.py

@@ -407,7 +407,6 @@ class WirelessInterface(Interface, BaseWirelessInterface):
             except ValueError:
                 return False
 
-            result = result
             if result.endswith("COMPLETED"):
                 return True
             elif result.endswith("DISCONNECTED"):

wicd/networking.py

@@ -831,17 +831,17 @@ class WirelessConnectThread(ConnectThread):
         self.reset_ip_addresses(wiface)
         self.stop_wpa(wiface)
         self.flush_routes(wiface)
-
-        # Generate PSK and authenticate if needed.
-        if self.wpa_driver != 'ralink legacy':
-            self.generate_psk_and_authenticate(wiface)
+        wiface.SetMode(self.network['mode'])
 
         # Put interface up.
         self.SetStatus('configuring_interface')
         self.put_iface_up(wiface)
         
+        # Generate PSK and authenticate if needed.
+        if self.wpa_driver != 'ralink legacy':
+            self.generate_psk_and_authenticate(wiface)
+            
         # Associate.
-        wiface.SetMode(self.network['mode'])
         wiface.Associate(self.network['essid'], self.network['channel'],
                          self.network['bssid'])