fix imports

[enigma2.git] / lib / python / Screens / NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 94d9fcbcf9f8bb493d7c40b06a6c67f7397d04d5..9514e7fd43a15e3f03e975791cdab6d5f615b44f 100644 (file)
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -1,11 +1,11 @@
 from Screen import Screen
 from Components.ActionMap import ActionMap
 from Screen import Screen
 from Components.ActionMap import ActionMap

-from Components.ConfigList import ConfigList, ConfigListScreen
+from Components.ConfigList import ConfigListScreen

 from Components.config import config, getConfigListEntry
 from Components.Network import iNetwork
 from Components.Label import Label
 from Components.MenuList import MenuList
 from Components.config import config, getConfigListEntry
 from Components.Network import iNetwork
 from Components.Label import Label
 from Components.MenuList import MenuList

-from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigNothing
+from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigNothing

 from Components.PluginComponent import plugins
 from Plugins.Plugin import PluginDescriptor
 
 from Components.PluginComponent import plugins
 from Plugins.Plugin import PluginDescriptor
 


@@ -137,6 +137,7 @@ class AdapterSetup(Screen, ConfigListScreen):
                                self.list.append(getConfigListEntry(_('Gateway'), self.gatewayConfigEntry))
                
                self.extended = None
                                self.list.append(getConfigListEntry(_('Gateway'), self.gatewayConfigEntry))
                
                self.extended = None

+               self.extendedSetup = None

                for p in plugins.getPlugins(PluginDescriptor.WHERE_NETWORKSETUP):
                        callFnc = p.__call__["ifaceSupported"](self.iface)
                        if callFnc is not None:
                for p in plugins.getPlugins(PluginDescriptor.WHERE_NETWORKSETUP):
                        callFnc = p.__call__["ifaceSupported"](self.iface)
                        if callFnc is not None:


@@ -147,7 +148,7 @@ class AdapterSetup(Screen, ConfigListScreen):
                                else:
                                        self.configStrings = None
                                
                                else:
                                        self.configStrings = None
                                

-                               if p.__call__.has_key(menuEntryName):
+                               if p.__call__.has_key("menuEntryName"):

                                        menuEntryName = p.__call__["menuEntryName"](self.iface)
                                else:
                                        menuEntryName = _('Extended Setup...')
                                        menuEntryName = p.__call__["menuEntryName"](self.iface)
                                else:
                                        menuEntryName = _('Extended Setup...')


@@ -183,8 +184,6 @@ class AdapterSetup(Screen, ConfigListScreen):
                        else:
                                iNetwork.removeAdapterAttribute(self.iface, "gateway")
                        
                        else:
                                iNetwork.removeAdapterAttribute(self.iface, "gateway")
                        

-                       print "self.extended:", self.extended
-                       print "self.configStrings:", self.configStrings

                        if self.extended is not None and self.configStrings is not None:
                                iNetwork.setAdapterAttribute(self.iface, "configStrings", self.configStrings(self.iface))
 
                        if self.extended is not None and self.configStrings is not None:
                                iNetwork.setAdapterAttribute(self.iface, "configStrings", self.configStrings(self.iface))