X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ad4f6abca583cdb5daaf066c67da436f0d8d8761..8d4316d824f584eb3900fef898de59c9aca8d771:/lib/python/Screens/Ipkg.py

diff --git a/lib/python/Screens/Ipkg.py b/lib/python/Screens/Ipkg.py
index af80e000..eac03479 100644
--- a/lib/python/Screens/Ipkg.py
+++ b/lib/python/Screens/Ipkg.py
@@ -3,6 +3,7 @@ from Components.Ipkg import IpkgComponent
 from Components.Label import Label
 from Components.Slider import Slider
 from Screens.Screen import Screen
+from Screens.MessageBox import MessageBox
 from enigma import eTimer
 
 class Ipkg(Screen):
@@ -10,6 +11,8 @@ class Ipkg(Screen):
 		Screen.__init__(self, session)
 		
 		self.cmdList = cmdList
+
+		self.sliderPackages = {}
 		
 		self.slider = Slider(0, len(cmdList))
 		self["slider"] = self.slider
@@ -25,7 +28,7 @@ class Ipkg(Screen):
 		
 		self.activity = 0
 		self.activityTimer = eTimer()
-		self.activityTimer.timeout.get().append(self.doActivityTimer)
+		self.activityTimer.callback.append(self.doActivityTimer)
 		#self.activityTimer.start(100, False)
 				
 		self.ipkg = IpkgComponent()
@@ -94,7 +97,16 @@ class Ipkg(Screen):
 			self.error += 1
 		elif event == IpkgComponent.EVENT_DONE:
 			self.runNextCmd()
-	
+		elif event == IpkgComponent.EVENT_MODIFIED:
+			self.session.openWithCallback(
+                                self.modificationCallback,
+                                MessageBox,
+                                _("A configuration file (%s) was modified since Installation.\nDo you want to keep your version?") % (param)
+                        )
+
+	def modificationCallback(self, res):
+		self.ipkg.write(res and "N" or "Y")
+
 	def exit(self):
 		if not self.ipkg.isRunning():
 			self.close()