Merge branch 'bug_203_fix_wrong_networkstate'

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

diff --combined lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index a78857a,c8568b9..c71037c
--- 1/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@@ -130,7 -130,7 +130,7 @@@ class WlanStatus(Screen)
  
        def exit(self):
                self.timer.stop()
-               self.close()    
+               self.close(True)        
  
        def updateStatusbar(self):
                self["BSSID"].setText(_("Please wait..."))
@@@ -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...':

diff --combined lib/python/Screens/NetworkSetup.py
index 9461242,b32ebaf..3e9354e
--- 1/lib/python/Screens/NetworkSetup.py
--- 2/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@@ -551,10 -551,7 +551,10 @@@ class AdapterSetup(Screen, ConfigListSc
                if (ret == True):               
                        num_configured_if = len(iNetwork.getConfiguredAdapters())
                        if num_configured_if >= 1:
 -                              self.session.openWithCallback(self.secondIfaceFoundCB, MessageBox, _("A second configured interface has been found.\n\nDo you want to disable the second network interface?"), default = True)
 +                              if num_configured_if == 1 and self.iface in iNetwork.getConfiguredAdapters():
 +                                      self.applyConfig(True)
 +                              else:
 +                                      self.session.openWithCallback(self.secondIfaceFoundCB, MessageBox, _("A second configured interface has been found.\n\nDo you want to disable the second network interface?"), default = True)
                        else:
                                self.applyConfig(True)
                else:
@@@ -665,6 -662,7 +665,7 @@@ class AdapterSetupConfiguration(Screen
                self.session = session
                self.iface = iface
                self.restartLanRef = None
+               self.LinkState = None
                self.mainmenu = self.genMainMenu()
                self["menulist"] = MenuList(self.mainmenu)
                self["key_red"] = StaticText(_("Close"))
@@@ -714,6 -712,7 +715,7 @@@
                self.onClose.append(self.cleanup)
  
        def ok(self):
+               self.cleanup()
                if self["menulist"].getCurrent()[1] == 'edit':
                        if self.iface == 'wlan0' or self.iface == 'ath0':
                                try:
@@@ -812,6 -811,8 +814,8 @@@
                        self["description"].setText(_(self["menulist"].getCurrent()[1][1]) + self.oktext )
                
        def updateStatusbar(self, data = None):
+               self.mainmenu = self.genMainMenu()
+               self["menulist"].l.setList(self.mainmenu)
                self["IFtext"].setText(_("Network:"))
                self["IF"].setText(iNetwork.getFriendlyAdapterName(self.iface))
                self["Statustext"].setText(_("Link:"))
@@@ -881,20 -882,14 +885,14 @@@
                                                # Display Wlan not available Message
                                                self.showErrorMessage()
                        else:
-                               self.mainmenu = self.genMainMenu()
-                               self["menulist"].l.setList(self.mainmenu)
                                self.updateStatusbar()
                else:
-                       self.mainmenu = self.genMainMenu()
-                       self["menulist"].l.setList(self.mainmenu)
                        self.updateStatusbar()
  
        def WlanStatusClosed(self, *ret):
                if ret is not None and len(ret):
                        from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
                        iStatus.stopWlanConsole()
-                       self.mainmenu = self.genMainMenu()
-                       self["menulist"].l.setList(self.mainmenu)
                        self.updateStatusbar()
  
        def WlanScanClosed(self,*ret):
@@@ -903,8 -898,6 +901,6 @@@
                else:
                        from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus,Status
                        iStatus.stopWlanConsole()
-                       self.mainmenu = self.genMainMenu()
-                       self["menulist"].l.setList(self.mainmenu)
                        self.updateStatusbar()
                        
        def restartLan(self, ret = False):
@@@ -926,15 -919,19 +922,19 @@@
                        self.session.open(MessageBox, _("Finished restarting your network"), type = MessageBox.TYPE_INFO, timeout = 10, default = False)
  
        def dataAvail(self,data):
-               self.output = data.strip()
-               result = self.output.split('\n')
-               pattern = re_compile("Link detected: yes")
-               for item in result:
-                       if re_search(pattern, item):
-                               self["statuspic"].setPixmapNum(0)
-                       else:
-                               self["statuspic"].setPixmapNum(1)
-               self["statuspic"].show()
+               self.LinkState = None
+               for line in data.splitlines():
+                       line = line.strip()
+                       if 'Link detected:' in line:
+                               if "yes" in line:
+                                       self.LinkState = True
+                               else:
+                                       self.LinkState = False
+               if self.LinkState == True:
+                       iNetwork.checkNetworkState(self.checkNetworkCB)
+               else:
+                       self["statuspic"].setPixmapNum(1)
+                       self["statuspic"].show()                        
  
        def showErrorMessage(self):
                self.session.open(MessageBox, self.errortext, type = MessageBox.TYPE_INFO,timeout = 10 )
@@@ -942,6 -939,7 +942,7 @@@
        def cleanup(self):
                iNetwork.stopLinkStateConsole()
                iNetwork.stopDeactivateInterfaceConsole()
+               iNetwork.stopPingConsole()
                try:
                        from Plugins.SystemPlugins.WirelessLan.Wlan import iStatus
                except ImportError:
@@@ -950,14 -948,33 +951,33 @@@
                        iStatus.stopWlanConsole()
  
        def getInfoCB(self,data,status):
+               self.LinkState = None
                if data is not None:
                        if data is True:
                                if status is not None:
                                        if status[self.iface]["acesspoint"] == "No Connection" or status[self.iface]["acesspoint"] == "Not-Associated" or status[self.iface]["acesspoint"] == False:
+                                               self.LinkState = False
                                                self["statuspic"].setPixmapNum(1)
+                                               self["statuspic"].show()
                                        else:
-                                               self["statuspic"].setPixmapNum(0)
-                                       self["statuspic"].show()
+                                               self.LinkState = True
+                                               iNetwork.checkNetworkState(self.checkNetworkCB)
+ 
+       def checkNetworkCB(self,data):
+               if iNetwork.getAdapterAttribute(self.iface, "up") is True:
+                       if self.LinkState is True:
+                               if data <= 2:
+                                       self["statuspic"].setPixmapNum(0)
+                               else:
+                                       self["statuspic"].setPixmapNum(1)
+                               self["statuspic"].show()        
+                       else:
+                               self["statuspic"].setPixmapNum(1)
+                               self["statuspic"].show()
+               else:
+                       self["statuspic"].setPixmapNum(1)
+                       self["statuspic"].show()
+ 
  
  class NetworkAdapterTest(Screen):     
        def __init__(self, session,iface):
@@@ -1376,4 -1393,4 +1396,4 @@@
                        pass
                else:
                        iStatus.stopWlanConsole()
-                       
+