projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental
[vuplus_dvbapp]
/
lib
/
python
/
Plugins
/
SystemPlugins
/
WirelessLan
/
plugin.py
diff --git
a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index
a78857a
..
6bfaec5
100755
(executable)
--- 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()
def exit(self):
self.timer.stop()
- self.close(
)
+ self.close(
True)
def updateStatusbar(self):
self["BSSID"].setText(_("Please wait..."))
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):
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
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...':
divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
encryption = encrypted and _("Yes") or _("No")
if bssid == 'hidden...':