gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-21 05:18:02 +01:00
Code Issues Projects Releases Wiki Activity

Integrated encryption into wired profiles.

Browse Source
This commit is contained in:
Joe MacMahon
2012-01-29 17:51:45 +00:00
parent 20b4b62c44
commit af3c388a08
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/netentry.py
View File

@@ -340,7 +340,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
self.chkbox_encryption = gtk.CheckButton(_('Use Encryption')) self.chkbox_encryption = gtk.CheckButton(_('Use Encryption'))
# Make the vbox to hold the encryption stuff. # Make the vbox to hold the encryption stuff.
self.vbox_encrypt_info = gtk.VBox(False, 0) self.vbox_encrypt_info = gtk.VBox(False, 0)
self.chkbox_encryption.set_active(not wired.GetWiredProperty('encryption_enabled') is None) self.chkbox_encryption.set_active(bool(wired.GetWiredProperty('encryption_enabled')))
self.combo_encryption.set_sensitive(False) self.combo_encryption.set_sensitive(False)
self.encrypt_types = misc.LoadEncryptionMethods(wired = True) self.encrypt_types = misc.LoadEncryptionMethods(wired = True)
@@ -404,6 +404,10 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
self.txt_dhcp_hostname.set_text(dhcphname) self.txt_dhcp_hostname.set_text(dhcphname)
self.reset_static_checkboxes() self.reset_static_checkboxes()
self.chkbox_encryption.set_active(bool(wired.GetWiredProperty('encryption_enabled')))
self.change_encrypt_method()
self.toggle_encryption()
def save_settings(self): def save_settings(self):
# Check encryption info # Check encryption info
encrypt_info = self.encryption_info encrypt_info = self.encryption_info

3
wicd/wicd-daemon.py
View File

@@ -1492,7 +1492,7 @@ class WiredDaemon(dbus.service.Object):
for option in ["ip", "broadcast", "netmask", "gateway", "search_domain", for option in ["ip", "broadcast", "netmask", "gateway", "search_domain",
"dns_domain", "dns1", "dns2", "dns3", "beforescript", "dns_domain", "dns1", "dns2", "dns3", "beforescript",
"afterscript", "predisconnectscript", "afterscript", "predisconnectscript",
"postdisconnectscript"]: "postdisconnectscript", "encryption_enabled"]:
self.config.set(profilename, option, None) self.config.set(profilename, option, None)
self.config.set(profilename, "default", default) self.config.set(profilename, "default", default)
self.config.set(profilename,"dhcphostname",os.uname()[1]) self.config.set(profilename,"dhcphostname",os.uname()[1])
@@ -1580,6 +1580,7 @@ class WiredDaemon(dbus.service.Object):
profile[x] = misc.Noneify(self.config.get(profilename, x)) profile[x] = misc.Noneify(self.config.get(profilename, x))
profile['use_global_dns'] = bool(profile.get('use_global_dns')) profile['use_global_dns'] = bool(profile.get('use_global_dns'))
profile['use_static_dns'] = bool(profile.get('use_static_dns')) profile['use_static_dns'] = bool(profile.get('use_static_dns'))
profile['encryption_enabled'] = bool(profile.get('encryption_enabled'))
profile['profilename'] = profilename profile['profilename'] = profilename
self.WiredNetwork = profile self.WiredNetwork = profile
self._cur_wired_prof_name = profilename self._cur_wired_prof_name = profilename