gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-10 11:35:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash with hidden essids if it was stored in wireless-settings.conf as None.

Browse Source 
Only trigger a wpa_supplicant rescan once when connecting.
This commit is contained in:
Dan O'Reilly
2009-04-04 13:43:29 -04:00
parent b79151ef07
commit 665fe76885
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wicd/wicd-daemon.py
View File

@@ -1170,18 +1170,17 @@ class WirelessDaemon(dbus.service.Object):
cur_network["has_profile"] = True
# Read the essid because we need to name those hidden
# wireless networks now - but only read it if it is hidden.
if cur_network["hidden"]:
cur_network["essid"] = self.config.get(section, "essid")
if cur_network["essid"] in ["", "Hidden", "<hidden>"]:
cur_network["essid"] = "<hidden>"
for x in self.config.options(section):
if not cur_network.has_key(x) or x.endswith("script"):
cur_network[x] = misc.Noneify(self.config.get(section, x))
for option in ['use_static_dns', 'use_global_dns', 'encryption',
'use_settings_globally']:
cur_network[option] = bool(cur_network.get(option))
# Read the essid because we need to name those hidden
# wireless networks now - but only read it if it is hidden.
if cur_network["hidden"]:
if cur_network.get("essid") in ["", "Hidden", "<hidden>", None]:
cur_network["essid"] = "<hidden>"
return "100: Loaded Profile"
@dbus.service.method('org.wicd.daemon.wireless')