Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 15 Dec 2009 18:29:43 +0000 (19:29 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 15 Dec 2009 18:29:43 +0000 (19:29 +0100)
Conflicts:
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/NetworkSetup.py

1  2 
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...':