From a00f7c4ae584b1981e085cf7cc5b55b20e843503 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 22 Apr 2009 19:53:08 -0500 Subject: [PATCH 1/8] Added NEWS file with major changes since 1.5.x. Updated CHANGES file with 'bzr log' output as of r367. --- CHANGES | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- NEWS | 34 ++++++++++++++ 2 files changed, 163 insertions(+), 8 deletions(-) create mode 100644 NEWS diff --git a/CHANGES b/CHANGES index 7cf7a3f..065096e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,11 +1,132 @@ -MAJOR CHANGES FROM 1.5: - * Enhanced GUI - * Console client (wicd-curses) - * Support for multiple backends - * Enhanced network setting properties - * Bug fixes - -CHANGELOG: +------------------------------------------------------------ +revno: 367 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Wed 2009-04-22 17:40:07 -0400 +message: + Merged r318 of experimental-nacl, fixing yet another wicd-curses bug. + ------------------------------------------------------------ + revno: 202.2.27 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Wed 2009-04-22 17:37:50 -0400 + message: + Made the network preferences dialogs save whether they are using static IPs or not. Thanks to Adam for finding this one. + ------------------------------------------------------------ + revno: 202.2.26 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Wed 2009-04-22 14:06:26 -0400 + message: + Merged r366 of mainline 1.6. +------------------------------------------------------------ +revno: 366 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Wed 2009-04-22 12:13:06 -0400 +message: + Set the SVG wicd icon as the window icon in wicd-client. +------------------------------------------------------------ +revno: 365 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Wed 2009-04-22 22:17:39 +0800 +message: + fixed another typo +------------------------------------------------------------ +revno: 364 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Wed 2009-04-22 22:11:33 +0800 +message: + fixed a typo +------------------------------------------------------------ +revno: 363 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Wed 2009-04-22 22:02:31 +0800 +message: + Updated version number +------------------------------------------------------------ +revno: 362 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Wed 2009-04-22 21:45:51 +0800 +message: + Updated vcsinfo.py generation logic +------------------------------------------------------------ +revno: 361 +committer: Dan O'Reilly +branch nick: experimental +timestamp: Tue 2009-04-21 21:25:59 -0400 +message: + Refactor monitor.py polling code to remove reliance on globals. + Make sure we update the polling rate in wicd-monitor when the backend changes. +------------------------------------------------------------ +revno: 360 +committer: Dan O'Reilly +branch nick: experimental +timestamp: Tue 2009-04-21 20:30:40 -0400 +message: + Use atexit instead of catching SIGTERM in wicd-daemon. + Use Popen to launch wicd-monitor instead of gobject.spawn_async. +------------------------------------------------------------ +revno: 359 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Tue 2009-04-21 17:47:46 -0400 +message: + Merged r316 of experimental-nacl, providing some small feature additions and bufixes. + ------------------------------------------------------------ + revno: 202.2.25 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Tue 2009-04-21 14:09:29 -0400 + message: + Fixed a problem where if a scan is initiated externally, and wicd-curses doesn't see it, wicd-curses will half-drop a running big dialog. + ------------------------------------------------------------ + revno: 202.2.24 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Tue 2009-04-21 13:34:01 -0400 + message: + Fix bug introduced in r356 where wicd would crash upon not finding dhclient. + ------------------------------------------------------------ + revno: 202.2.23 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Tue 2009-04-21 13:16:44 -0400 + message: + Added support for disabling nonexistent external tools in the pref_curses.py. + Added a DynRadioButton in curses_misc.py. + ------------------------------------------------------------ + revno: 202.2.22 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Tue 2009-04-21 13:15:30 -0400 + message: + Merged with r358 of mainline 1.6. + ------------------------------------------------------------ + revno: 202.2.21 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Fri 2009-04-17 08:04:02 -0400 + message: + Merged r355 of mainline 1.6. + ------------------------------------------------------------ + revno: 202.2.20 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Sun 2009-04-12 12:12:38 -0400 + message: + Merge r352 of mainline 1.6 +------------------------------------------------------------ +revno: 358 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Tue 2009-04-21 22:33:29 +0800 +message: + Updated CHANGES ------------------------------------------------------------ revno: 357 committer: Andrew Psaltis diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..0aa709a --- /dev/null +++ b/NEWS @@ -0,0 +1,34 @@ +Wicd 1.6.x Branch + +Major Changes: +- Improved tray icon and gui images (thanks to Martin Sagastume) +- Reorganized network list in the gui for easier navigation +- New experimental ioctl backend, which is more cpu-friendly than the + previous one +- Added a curses client (thanks to Andrew Psaltis) +- Added a right-click connection menu to the tray icon +- 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 + +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) + From c9b3a507d88d14f32ec604dd81ebee73dd5d1744 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sat, 25 Apr 2009 22:55:12 -0500 Subject: [PATCH 2/8] Synced CHANGES file with mainline. Minor tweaks to NEWS file (mostly formatting). --- CHANGES | 56 +++++++++++++++++++++++++++++++++++------------ NEWS | 68 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 76 insertions(+), 48 deletions(-) diff --git a/CHANGES b/CHANGES index 065096e..7556ef8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,31 +1,59 @@ ------------------------------------------------------------ +revno: 369 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Sun 2009-04-26 08:00:33 +0900 +message: + Redirected bzr output to /dev/null +------------------------------------------------------------ +revno: 368 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Sun 2009-04-26 07:53:24 +0900 +message: + Fixed setup.py translations installation and made wicd-daemon.py +x +------------------------------------------------------------ revno: 367 -committer: Andrew Psaltis +committer: Adam Blackburn branch nick: 1.6 -timestamp: Wed 2009-04-22 17:40:07 -0400 +timestamp: Thu 2009-04-23 19:41:10 +0800 message: - Merged r318 of experimental-nacl, fixing yet another wicd-curses bug. + Merged ------------------------------------------------------------ - revno: 202.2.27 + revno: 365.1.2 committer: Andrew Psaltis - branch nick: experimental-nacl - timestamp: Wed 2009-04-22 17:37:50 -0400 + branch nick: 1.6 + timestamp: Wed 2009-04-22 17:40:07 -0400 message: - Made the network preferences dialogs save whether they are using static IPs or not. Thanks to Adam for finding this one. + Merged r318 of experimental-nacl, fixing yet another wicd-curses bug. + ------------------------------------------------------------ + revno: 202.2.27 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Wed 2009-04-22 17:37:50 -0400 + message: + Made the network preferences dialogs save whether they are using static IPs or not. Thanks to Adam for finding this one. + ------------------------------------------------------------ + revno: 202.2.26 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Wed 2009-04-22 14:06:26 -0400 + message: + Merged r366 of mainline 1.6. ------------------------------------------------------------ - revno: 202.2.26 + revno: 365.1.1 committer: Andrew Psaltis - branch nick: experimental-nacl - timestamp: Wed 2009-04-22 14:06:26 -0400 + branch nick: 1.6 + timestamp: Wed 2009-04-22 12:13:06 -0400 message: - Merged r366 of mainline 1.6. + Set the SVG wicd icon as the window icon in wicd-client. ------------------------------------------------------------ revno: 366 -committer: Andrew Psaltis +committer: Adam Blackburn branch nick: 1.6 -timestamp: Wed 2009-04-22 12:13:06 -0400 +timestamp: Thu 2009-04-23 19:38:48 +0800 message: - Set the SVG wicd icon as the window icon in wicd-client. + Updated CHANGES and added NEWS ------------------------------------------------------------ revno: 365 committer: Adam Blackburn diff --git a/NEWS b/NEWS index 0aa709a..536b3f1 100644 --- a/NEWS +++ b/NEWS @@ -1,34 +1,34 @@ -Wicd 1.6.x Branch - -Major Changes: -- Improved tray icon and gui images (thanks to Martin Sagastume) -- Reorganized network list in the gui for easier navigation -- New experimental ioctl backend, which is more cpu-friendly than the - previous one -- Added a curses client (thanks to Andrew Psaltis) -- Added a right-click connection menu to the tray icon -- 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 - -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) - +Wicd 1.6.x Branch + +Major Changes: +- Improved tray icon and gui images (thanks to Martin Sagastume) +- Reorganized network list in the gui for easier navigation +- New experimental ioctl backend, which is more cpu-friendly than the + previous one +- Added a curses client (thanks to Andrew Psaltis) +- Added a right-click connection menu to the tray icon +- 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) + From 9588a78b68bc6d14b3b6162da38793253b5dc49e Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sat, 25 Apr 2009 23:17:33 -0500 Subject: [PATCH 3/8] Use set_icon_name() instead of set_icon_from_file() in gui.py ; this allows gtk to use the themed icons (and presumably the correct size and all that good stuff). --- wicd/gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd/gui.py b/wicd/gui.py index e6bdecb..47227ba 100644 --- a/wicd/gui.py +++ b/wicd/gui.py @@ -149,7 +149,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] From 63b00dd75696b2216d2598fb486399508f58162d Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 26 Apr 2009 21:38:10 -0500 Subject: [PATCH 4/8] Clarified some required versions in INSTALL --- INSTALL | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index e563e4b..7537ed4 100644 --- a/INSTALL +++ b/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) - 8. pm-utils (optional for suspend/resume integration - needs version 1.2.4+) + 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) If you are installing from a bzr pull or beta/rc tarball and you want the native language translations, first run this: From c6ad1c570633ad2f4fe2d8658dede14b6d2e4981 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 28 Apr 2009 10:51:16 -0500 Subject: [PATCH 5/8] Tweaks to NEWS file. --- NEWS | 57 +++++++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index 3b3c184..536b3f1 100644 --- a/NEWS +++ b/NEWS @@ -1,25 +1,34 @@ -MAIN CHANGES: -- New and improved tray icon and gui images. (Thanks to Martin Sagastume). -- Re-organized network list in the GUI to be easier to navigate. -- Added new experimental ioctl backend, which is more CPU friendly than the previous one. -- Added a curses client (Thanks to Andrew Psaltis). -- Added a right-click connection menu to the tray icon. -- Add options to specify a dns domain and search domain for static networks. -- Re-worked Preferences menu to be more in line with GNOME standards. -- Support for global scripts. -- Make it possible to have optional entries in encryption templates. +Wicd 1.6.x Branch + +Major Changes: +- Improved tray icon and gui images (thanks to Martin Sagastume) +- Reorganized network list in the gui for easier navigation +- New experimental ioctl backend, which is more cpu-friendly than the + previous one +- Added a curses client (thanks to Andrew Psaltis) +- Added a right-click connection menu to the tray icon +- 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). From 51c6ef0f0ee15a00056d81432bbe5dee8770cf49 Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Fri, 1 May 2009 13:41:13 +0800 Subject: [PATCH 6/8] Also catch AttributeErrors when guessing data types --- wicd/configmanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd/configmanager.py b/wicd/configmanager.py index 24d8dd4..8862bc8 100644 --- a/wicd/configmanager.py +++ b/wicd/configmanager.py @@ -108,7 +108,7 @@ class ConfigManager(RawConfigParser): try: if not ret.startswith('0') or len(ret) == 1: ret = int(ret) - except (ValueError, TypeError): + except (ValueError, TypeError, AttributeError): ret = Noneify(ret) # This is a workaround for a python-dbus issue on 64-bit systems. if isinstance(ret, (int)): From adec1fdc18a30e9c51e7f1863d774afb5ff73f99 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Fri, 1 May 2009 20:20:40 -0400 Subject: [PATCH 7/8] Fix crash when saving settings for unencrypted networks. Remove unneeded function in prefs.py --- wicd/netentry.py | 4 ++-- wicd/prefs.py | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/wicd/netentry.py b/wicd/netentry.py index 460f387..a4cfa40 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -405,9 +405,9 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): def save_settings(self, networkid): # Check encryption info + encrypt_info = self.encryption_info if self.chkbox_encryption.get_active(): print "setting encryption info..." - encrypt_info = self.encryption_info encrypt_methods = self.encrypt_types self.set_net_prop("enctype", encrypt_methods[self.combo_encryption.get_active()]['type']) @@ -432,7 +432,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): print "no encryption specified..." self.set_net_prop("enctype", "None") for entry in encrypt_info.iterkeys(): - self.set_net_prop(entry[0].entry, "") + self.set_net_prop(entry[0], "") AdvancedSettingsDialog.save_settings(self) if self.chkbox_global_settings.get_active(): diff --git a/wicd/prefs.py b/wicd/prefs.py index 30d7a5d..80634b4 100644 --- a/wicd/prefs.py +++ b/wicd/prefs.py @@ -57,12 +57,9 @@ class PreferencesDialog(object): def _setup_external_app_radios(self, radio_list, get_method, set_method): """ Generic function for setting up external app radios. """ - def set_available(apps): - for app in apps: - app.set_sensitive(daemon.GetAppAvailable(app.get_label())) - # Disable radios for apps that aren't installed. - set_available(radio_list[1:]) + for app in radio_list[1:]: + app.set_sensitive(daemon.GetAppAvailable(app.get_label())) selected_app = get_method() # Make sure the app we want to select is actually available. if radio_list[selected_app].get_property("sensitive"): From 8dcc028c392c1bbd4fb87cd6072dd178ba76f033 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Fri, 1 May 2009 20:26:46 -0400 Subject: [PATCH 8/8] Fix bug where shared essid settings couldn't be disabled once they were turned on. --- wicd/wicd-daemon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index 073d1b1..17f3e2d 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -1201,8 +1201,8 @@ class WirelessDaemon(dbus.service.Object): # We want to write the essid in addition to bssid # sections if global settings are enabled. + self.config.remove_section(essid_key) if cur_network["use_settings_globally"]: - self.config.remove_section(essid_key) self.config.add_section(essid_key) for x in cur_network: