Merge r375 of mainline 1.6.

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'])

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"):

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: