gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-06 05:44:18 +01:00
Code Issues Projects Releases Wiki Activity

updated hidden network ESSID retrieval code

Browse Source
This commit is contained in:
Adam Blackburn
2009-08-15 18:12:40 -05:00
parent 3d1a0500f0
commit 126a4e145e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wicd/wicd-daemon.py
View File

@@ -1199,11 +1199,12 @@ class WirelessDaemon(dbus.service.Object):
# Read the essid because we need to name those hidden # Read the essid because we need to name those hidden
# wireless networks now - but only read it if it is hidden. # wireless networks now - but only read it if it is hidden.
if cur_network["hidden"]: if cur_network["hidden"]:
if cur_network.get("essid") in ["", "Hidden", "<hidden>", None]: # check if there is an essid in the config file
cur_network["essid"] = "<hidden>" # if there isn't, .get( will return None
else: stored_essid = self.config.get(section, 'essid')
cur_network['essid'] = self.config.get(section, 'essid') if stored_essid:
return "100: Loaded Profile" # set the current network's ESSID to the stored one
cur_network['essid'] = stored_essid
@dbus.service.method('org.wicd.daemon.wireless') @dbus.service.method('org.wicd.daemon.wireless')
def SaveWirelessNetworkProfile(self, id): def SaveWirelessNetworkProfile(self, id):

2
wicd/wnettools.py
View File

@@ -1177,7 +1177,7 @@ class BaseWirelessInterface(BaseInterface):
except (UnicodeDecodeError, UnicodeEncodeError): except (UnicodeDecodeError, UnicodeEncodeError):
print 'Unicode problem with current network essid, ignoring!!' print 'Unicode problem with current network essid, ignoring!!'
return None return None
if ap['essid'] in ['<hidden>', "", None]: if ap['essid'] in ['Hidden', '<hidden>', "", None]:
print 'hidden' print 'hidden'
ap['hidden'] = True ap['hidden'] = True
ap['essid'] = "<hidden>" ap['essid'] = "<hidden>"