diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2009-12-15 19:29:43 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2009-12-15 19:29:43 +0100 |
| commit | defadb893d6897935165b63a9de09b95f43dfcc1 (patch) | |
| tree | e24a3faa54908e04170f9c393a2c73cdd0e24de9 /lib/python/Plugins | |
| parent | 46b2ddde6868639c2c437f1bed6d6db27a71038d (diff) | |
| parent | bfd5fa5d07a4c26aeb028a68818a9e2300c9dc6f (diff) | |
| download | enigma2-defadb893d6897935165b63a9de09b95f43dfcc1.tar.gz enigma2-defadb893d6897935165b63a9de09b95f43dfcc1.zip | |
Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental
Conflicts:
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/NetworkSetup.py
Diffstat (limited to 'lib/python/Plugins')
| -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..6bfaec52 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 +======= +>>>>>>> origin/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...': |