From adec1fdc18a30e9c51e7f1863d774afb5ff73f99 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Fri, 1 May 2009 20:20:40 -0400 Subject: [PATCH 1/2] 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 2/2] 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: