From 5e5f73dd3ed200d374e8253332017ee6d62baa4d Mon Sep 17 00:00:00 2001
From: Andrew Psaltis <ampsaltis@gmail.com>
Date: Tue, 14 Apr 2009 01:06:36 -0400
Subject: [PATCH 1/3] Updated wicd-curses.8.in, made the date in wicd-client.1
 accurate, fixed a typo in setup.py, and added a bdist_rpm option in
 setup.cfg.

---
 in/man=wicd-curses.8.in | 6 +++---
 man/wicd-client.1       | 2 +-
 setup.cfg               | 2 ++
 setup.py                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/in/man=wicd-curses.8.in b/in/man=wicd-curses.8.in
index 603b057..7381627 100644
--- a/in/man=wicd-curses.8.in
+++ b/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
diff --git a/man/wicd-client.1 b/man/wicd-client.1
index 9925b0c..6d86469 100644
--- a/man/wicd-client.1
+++ b/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
diff --git a/setup.cfg b/setup.cfg
index 4bd9609..d57f647 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,4 @@
 [install]
 record = install.log
+[bdist_rpm]
+group = Productivity/Networking/System
diff --git a/setup.py b/setup.py
index d95153d..35df602 100755
--- a/setup.py
+++ b/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",

From b82212e9a6b84c5f0b61e032b70a7e0d0083aada Mon Sep 17 00:00:00 2001
From: Dan O'Reilly <oreilldf@gmail.com>
Date: Thu, 16 Apr 2009 21:49:42 -0400
Subject: [PATCH 2/3] Remove pointless assignment in be-ioctl Set wireless mode
 before putting interface up. Put wireless interfaces up before trying to
 authenticate.

---
 wicd/backends/be-ioctl.py |  1 -
 wicd/networking.py        | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wicd/backends/be-ioctl.py b/wicd/backends/be-ioctl.py
index ed7dc3f..3d16486 100644
--- a/wicd/backends/be-ioctl.py
+++ b/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"):
diff --git a/wicd/networking.py b/wicd/networking.py
index 084b8e3..1260505 100644
--- a/wicd/networking.py
+++ b/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'])
 

From 242b740a9a509f27cf18c78e7ec54ac56726a960 Mon Sep 17 00:00:00 2001
From: Adam Blackburn <compwiz18@gmail.com>
Date: Fri, 17 Apr 2009 14:38:12 +0900
Subject: [PATCH 3/3] Made wicd-daemon.py executable

---
 wicd/wicd-daemon.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 wicd/wicd-daemon.py

diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py
old mode 100644
new mode 100755