diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 07:15:51 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-23 07:15:51 +0100 |
| commit | 786a5a906d13ec5832fbecf5c4fa5421f2cac790 (patch) | |
| tree | dad699d93fac8d8d0476f522a8d0d6b2035e2504 /lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py | |
| parent | 44985357544c5a3bf67a758c8612102ac59a74cc (diff) | |
| parent | 075c89b1e624ce80fa02aa789a319d84cbe928b4 (diff) | |
| download | enigma2-786a5a906d13ec5832fbecf5c4fa5421f2cac790.tar.gz enigma2-786a5a906d13ec5832fbecf5c4fa5421f2cac790.zip | |
Merge branch 'bug_203_fix_wrong_networkstate'
Conflicts:
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/NetworkSetup.py
Diffstat (limited to 'lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py')
| -rwxr-xr-x | lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py index a78857a6..c71037c5 100755 --- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py +++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py @@ -130,7 +130,7 @@ class WlanStatus(Screen): def exit(self): self.timer.stop() - self.close() + self.close(True) def updateStatusbar(self): self["BSSID"].setText(_("Please wait...")) @@ -262,8 +262,11 @@ class WlanScan(Screen): self.updateAPList() def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal): +<<<<<<< HEAD:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py print "buildEntryComponent",essid print "buildEntryComponent",bssid +======= +>>>>>>> bug_203_fix_wrong_networkstate:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png")) encryption = encrypted and _("Yes") or _("No") if bssid == 'hidden...': |