code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-vuplus/enigma2/enigma2/enigma2_vuplus_networksetup.patch

   1 diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
   2 index 32b9f54..b31ba3a 100755
   3 --- a/lib/python/Screens/NetworkSetup.py
   4 +++ b/lib/python/Screens/NetworkSetup.py
   5 @@ -60,7 +60,11 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
   6                         "yellow": (self.setDefaultInterface, [_("Set interface as default Interface"),_("* Only available if more than one interface is active.")] ),
   7                         })
   8
   9 -               self.adapters = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getAdapterList()]
  10 +               self.adapters = []
  11 +               self.adapterList = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getAdapterList()]
  12 +               for x in self.adapterList:
  13 +                       if x[1].startswith('eth'):
  14 +                               self.adapters.append(x)
  15
  16                 if not self.adapters:
  17                         self.adapters = [(iNetwork.getFriendlyAdapterName(x),x) for x in iNetwork.getConfiguredAdapters()]
  18 @@ -98,7 +102,12 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
  19                         else:
  20                                 interfacepng = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/network_wireless.png"))
  21
  22 -               num_configured_if = len(iNetwork.getConfiguredAdapters())
  23 +#              num_configured_if = len(iNetwork.getConfiguredAdapters())
  24 +               num_configured_if=0
  25 +               for x in iNetwork.getConfiguredAdapters():
  26 +                       if x.startswith('eth'):
  27 +                               num_configured_if+=1
  28 +
  29                 if num_configured_if >= 2:
  30                         if default is True:
  31                                 defaultpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/buttons/button_blue.png"))
  32 @@ -116,7 +125,12 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
  33         def updateList(self):
  34                 self.list = []
  35                 default_gw = None
  36 -               num_configured_if = len(iNetwork.getConfiguredAdapters())
  37 +#              num_configured_if = len(iNetwork.getConfiguredAdapters())
  38 +               num_configured_if=0
  39 +               for x in iNetwork.getConfiguredAdapters():
  40 +                       if x.startswith('eth'):
  41 +                               num_configured_if+=1
  42 +
  43                 if num_configured_if >= 2:
  44                         self["key_yellow"].setText(_("Default"))
  45                         self["introduction"].setText(self.defaulttext)