git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/translations' into experimental
[enigma2.git]
/
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 c71037c53d2946a8dfe393bfbe1cd9d404adba7d..6873ffa41411ce20204c1dac0173e009a9df9506 100755
(executable)
--- a/
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@
-262,11
+262,6
@@
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
-=======
->>>>>>> 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...':
@@
-399,4
+394,3
@@
def configStrings(iface):
def Plugins(**kwargs):
return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."})
def Plugins(**kwargs):
return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."})
-
\ No newline at end of file