From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 15 Dec 2009 18:29:43 +0000 (+0100)
Subject: Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~149
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/defadb893d6897935165b63a9de09b95f43dfcc1

Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
	lib/python/Screens/NetworkSetup.py
---

defadb893d6897935165b63a9de09b95f43dfcc1
diff --cc lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index a78857a6,c8568b98..6bfaec52
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@@ -262,8 -262,6 +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...':