From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 23 Dec 2009 06:15:51 +0000 (+0100)
Subject: Merge branch 'bug_203_fix_wrong_networkstate'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=786a5a906d13ec5832fbecf5c4fa5421f2cac790

Merge branch 'bug_203_fix_wrong_networkstate'

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

786a5a906d13ec5832fbecf5c4fa5421f2cac790
diff --cc lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index a78857a,c8568b9..c71037c
--- 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
++=======
++>>>>>>> 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...':