Merge 1.6-rworkman (thanks!)

INSTALL

@@ -1,15 +1,16 @@
 Installation of Wicd should be done using your distribution package if one
 exists.  If not, the installation is relatively straightforward, but there
 are a few dependencies:
-  1. python (obviously) and pygtk
+  1. python (>=2.4, <3.0)
+  2. pygtk (>=2.10)
   2. dbus and its glib and python bindings
   3. a dhcp client (dhclient, dhcpcd, and pump are supported)
   4. wireless-tools (iwlist, iwconfig, etcetera)
   5. net-tools (ip, route, etcetera)
   6. a graphical sudo application (gksu, kdesu, and ktsuss are supported),
      while optional, is strongly recommended
-  7. urwid (if you want to use the curses client)
+  7. urwid (if you want to use the curses client - needs version >=0.9.8.3)
-  8. pm-utils (optional for suspend/resume integration - needs version 1.2.4+)
+  8. pm-utils (optional for suspend/resume integration - needs version >=1.2.4)
 
 If you are installing from a bzr pull or beta/rc tarball and you want 
 the native language translations, first run this:

NEWS

@@ -1,25 +1,34 @@
-MAIN CHANGES:
+Wicd 1.6.x Branch
-- New and improved tray icon and gui images.  (Thanks to Martin Sagastume).
+
-- Re-organized network list in the GUI to be easier to navigate.
+Major Changes:
-- Added new experimental ioctl backend, which is more CPU friendly than the previous one.
+- Improved tray icon and gui images (thanks to Martin Sagastume)
-- Added a curses client (Thanks to Andrew Psaltis).
+- Reorganized network list in the gui for easier navigation
-- Added a right-click connection menu to the tray icon.
+- New experimental ioctl backend, which is more cpu-friendly than the 
-- Add options to specify a dns domain and search domain for static networks.
+  previous one 
-- Re-worked Preferences menu to be more in line with GNOME standards.
+- Added a curses client (thanks to Andrew Psaltis)
-- Support for global scripts.
+- Added a right-click connection menu to the tray icon
-- Make it possible to have optional entries in encryption templates.
+- Added options to specify a dns domain and search domain for static networks
+- Reworked the Preferences menu to be more in line with GNOME standards
+- Added support for global scripts
+- Made it possible to have optional entries in encryption templates
+
+Minor Changes and Other Enchancements:
+- Better autoconnection behavior
+- Tray/GUI will survive the daemon being killed
+- Reasons for connection failures will now bubble back to the GUI
+- Add/Remove wired profile system is now more user-friendly
+- Support for using resolvconf instead of directly editing /etc/resolv.conf
+- Wicd won't blindly kill dhcp clients / wpa_supplicant any more
+- Added an option to automatically switch from a wireless network to a wired 
+  one as soon as a cable is plugged in
+- Moved scanning to its own thread, which makes GUI and daemon more responsive
+  during scans
+- Made it possible to specify macros in script entries
+- The gui will now display the encryption entry dialog if you attempt to 
+  connect to an encrypted network without entering a password
+- Static gateway entry is now optional
+- Passwords with leading or trailing whitespace are now stored properly
+- Many init/config script, man page, and setup.py fixes/updates, including
+  better autodetection of file placement with regard to sleep hooks and 
+  kde autostart files (thanks to Robby Workman)
 
-SMALL CHANGES:
-- Better autoconnection behavior.
-- Tray/GUI will survive the daemon going down.
-- Reasons for connection failures will now bubble back to the GUI.
-- Add/Remove wired profile system is now more user-friendly.
-- Support for using resolvconf instead of directly editing /etc/resolv.conf. 
-- Wicd won't blindly kill dhcp clients / wpa_supplicant anymore.
-- Added an option to automatically switch from a wireless network to a wired one as soon as a cable is plugged in.
-- Move scanning to its own thread, which makes GUI and daemon more responsive during scans. 
-- Make it possible to specify macros in script entries.
-- GUI will now display the encryption entry dialog if you attempt to connect to an encrypted network without entering a password.
-- Static gateway entry is now optional.
-- Passwords with leading or trailing whitespace are now stored properly.
-- Many init/config script, man page, and setup.py fixes/updates (Thanks to Robby Workman).

wicd/gui.py

@@ -148,7 +148,7 @@ class appGui(object):
         gladefile = os.path.join(wpath.share, "wicd.glade")
         self.wTree = gtk.glade.XML(gladefile)
         self.window = self.wTree.get_widget("window1")
-        self.window.set_icon_from_file(wpath.icons +'scalable/apps/wicd-client.svg')
+        self.window.set_icon_name("wicd-client")
         size = daemon.ReadWindowSize("main")
         width = size[0]
         height = size[1]