git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
python
/
Screens
/
NetworkSetup.py
diff --git
a/lib/python/Screens/NetworkSetup.py
b/lib/python/Screens/NetworkSetup.py
index 5cb4d3903fda5db774a386aabe26c7c8220dbd0e..ea2d17e6dfca0acef5276d50b59d64268a5cbb60 100755
(executable)
--- 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)
if len(self.adapters) == 1:
self.onFirstExecBegin.append(self.okbuttonClick)
self.onClose.append(self.cleanup)
-
+
+
def updateList(self):
self.list = []
default_gw = None
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:
def cancel(self):
if self.oldInterfaceState is False:
- iNetwork.deactivateInterface(self.iface,self.
deactivateInterface
CB)
+ iNetwork.deactivateInterface(self.iface,self.
cancel
CB)
else:
self.close('cancel')
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:
def cancelCB(self,data):
if data is not None:
if data is True: