X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2a8ecd871020fdd668cf5500460e5a6e7851b4b0..2b80914bdd9aada1797f450bbb9089f6d9bb5740:/lib/python/Screens/PluginBrowser.py

diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py
index 6d0439ed..0f6ee746 100644
--- a/lib/python/Screens/PluginBrowser.py
+++ b/lib/python/Screens/PluginBrowser.py
@@ -74,8 +74,8 @@ class PluginDownloadBrowser(Screen):
 		self.type = type
 		
 		self.container = eConsoleAppContainer()
-		self.container.appClosed.get().append(self.runFinished)
-		self.container.dataAvail.get().append(self.dataAvail)
+		self.container.appClosed.append(self.runFinished)
+		self.container.dataAvail.append(self.dataAvail)
 		self.onLayoutFinish.append(self.startRun)
 		self.onShown.append(self.setWindowTitle)
 		
@@ -106,17 +106,18 @@ class PluginDownloadBrowser(Screen):
 		if sel is None:
 			return
 
-		if type(sel[0]) is str: # category
-			if sel[0] in self.expanded:
-				self.expanded.remove(sel[0])
+		sel = sel[0]
+		if isinstance(sel, str): # category
+			if sel in self.expanded:
+				self.expanded.remove(sel)
 			else:
-				self.expanded.append(sel[0])
+				self.expanded.append(sel)
 			self.updateList()
 		else:
 			if self.type == self.DOWNLOAD:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"" + sel[0].name + "\"?"))
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to download\nthe plugin \"%s\"?") % sel.name)
 			elif self.type == self.REMOVE:
-				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"" + sel[0].name + "\"?"))
+				self.session.openWithCallback(self.runInstall, MessageBox, _("Do you really want to REMOVE\nthe plugin \"%s\"?") % sel.name)
 
 	def runInstall(self, val):
 		if val:
@@ -141,8 +142,8 @@ class PluginDownloadBrowser(Screen):
 		
 	def installFinished(self):
 		plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
-		self.container.appClosed.get().remove(self.runFinished)
-		self.container.dataAvail.get().remove(self.dataAvail)
+		self.container.appClosed.remove(self.runFinished)
+		self.container.dataAvail.remove(self.dataAvail)
 		self.close()
 
 	def runFinished(self, retval):