Merge branch 'bug_258_sorting_of_configsatlist' into experimental

1 files changed, 1 insertions, 13 deletions

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index a596b96d..876e3a34 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1184,24 +1184,12 @@ class ConfigSatlist(ConfigSelection):
 	def __init__(self, list, default = None):
 		if default is not None:
 			default = str(default)
-		self._satList = list
-		choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list]
-		
-		ConfigSelection.__init__(self, choices = choices, default = default)
+		ConfigSelection.__init__(self, choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list], default = default)
 
-	# use this function to get the orbital position, don't rely on .index
 	def getOrbitalPosition(self):
 		if self.value == "":
 			return None
 		return int(self.value)
-	
-	def getSatList(self):
-		return self._satList
-	
-	def getSat(self):
-		return self.satList[self.index]
-	
-	satList = property(getSatList)
 
 	orbital_position = property(getOrbitalPosition)