From 6933710b3eab806151f6352d3b1a228fb72a3e96 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 14 Nov 2008 08:24:36 +0100 Subject: small skin fix fix possible crash when leaving networksetup --- lib/python/Components/Network.py | 1 + lib/python/Screens/NetworkSetup.py | 1 + 2 files changed, 2 insertions(+) (limited to 'lib/python') diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index 7cc61d84..53b487d5 100755 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -63,6 +63,7 @@ class Network: def getDataForInterface(self, iface,callback): #get ip out of ip addr, as avahi sometimes overrides it in ifconfig. + self.Console = Console() cmd = "ip -o addr" self.Console.ePopen(cmd, self.IPaddrFinished, [iface,callback]) diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index 588a46ff..32e2dafd 100755 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -174,6 +174,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen): def cleanup(self): iNetwork.stopLinkStateConsole() iNetwork.stopRestartConsole() + iNetwork.stopGetInterfacesConsole() def restartLan(self): iNetwork.restartNetwork(self.restartLanDataAvail) -- cgit v1.2.3 From da81f2941ca129621d6511d1dcbc96bd29f4802b Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 14 Nov 2008 09:54:41 +0100 Subject: make hidden... translateable --- lib/python/Screens/NetworkSetup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index 32e2dafd..5cb4d390 100755 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -426,10 +426,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen): if a['active']: if a['essid'] == "": a['essid'] = a['bssid'] - self.nwlist.append( a['essid']) + self.nwlist.append((a['essid'],a['essid'])) self.nwlist.sort(key = lambda x: x[0]) except: - self.nwlist.append("No Networks found") + self.nwlist.append(("No Networks found",_("No Networks found"))) self.wsconfig = self.ws.loadConfig() if self.essid is not None: # ssid from wlan scan @@ -438,10 +438,9 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen): self.default = self.wsconfig['ssid'] if "hidden..." not in self.nwlist: - self.nwlist.append("hidden...") + self.nwlist.append(("hidden...",_("hidden network"))) if self.default not in self.nwlist: - self.nwlist.append(self.default) - + self.nwlist.append((self.default,self.default)) config.plugins.wlan.essid = NoSave(ConfigSelection(self.nwlist, default = self.default )) config.plugins.wlan.hiddenessid = NoSave(ConfigText(default = self.wsconfig['hiddenessid'], visible_width = 50, fixed_size = False)) -- cgit v1.2.3 From 3efc0ecb3b3d250b2ccc13fb1b2bcad06efb1aa4 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 14 Nov 2008 12:26:44 +0100 Subject: dont start self.console twice --- lib/python/Components/Network.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index 53b487d5..f32a648c 100755 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -63,7 +63,8 @@ class Network: def getDataForInterface(self, iface,callback): #get ip out of ip addr, as avahi sometimes overrides it in ifconfig. - self.Console = Console() + if not self.Console: + self.Console = Console() cmd = "ip -o addr" self.Console.ePopen(cmd, self.IPaddrFinished, [iface,callback]) @@ -213,15 +214,16 @@ class Network: for ifacename, iface in ifaces.items(): if self.ifaces.has_key(ifacename): self.ifaces[ifacename]["dhcp"] = iface["dhcp"] - if len(self.Console.appContainers) == 0: - # save configured interfacelist - self.configuredNetworkAdapters = self.configuredInterfaces - # load ns only once - self.loadNameserverConfig() - print "read configured interfac:", ifaces - print "self.ifaces after loading:", self.ifaces - if callback is not None: - callback(True) + if self.Console: + if len(self.Console.appContainers) == 0: + # save configured interfacelist + self.configuredNetworkAdapters = self.configuredInterfaces + # load ns only once + self.loadNameserverConfig() + print "read configured interfac:", ifaces + print "self.ifaces after loading:", self.ifaces + if callback is not None: + callback(True) def loadNameserverConfig(self): ipRegexp = "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" -- cgit v1.2.3 From d2c353af6c84de0958ed56ef817e67f21934f59c Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 14 Nov 2008 12:50:03 +0100 Subject: remove unneeded check --- lib/python/Screens/NetworkSetup.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'lib/python') diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index 5cb4d390..ea2d17e6 100755 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -88,7 +88,8 @@ class NetworkAdapterSelection(Screen,HelpableScreen): if len(self.adapters) == 1: self.onFirstExecBegin.append(self.okbuttonClick) self.onClose.append(self.cleanup) - + + def updateList(self): self.list = [] default_gw = None @@ -650,15 +651,10 @@ class AdapterSetup(Screen, ConfigListScreen, HelpableScreen): def cancel(self): if self.oldInterfaceState is False: - iNetwork.deactivateInterface(self.iface,self.deactivateInterfaceCB) + iNetwork.deactivateInterface(self.iface,self.cancelCB) else: self.close('cancel') - def deactivateInterfaceCB(self,data): - if data is not None: - if data is True: - iNetwork.getInterfaces(self.cancelCB) - def cancelCB(self,data): if data is not None: if data is True: -- cgit v1.2.3