meta/plugin_graphmultiepg.xml: fix merge conflict

[enigma2.git] / lib / python / Screens / HarddiskSetup.py

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 1578fae1ff11dae31463c52804ed77409a3c5f5b..c9f069feb4262fb381870410923f564c7b69ec1c 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -24,10 +24,10 @@ class HarddiskWait(Screen):
                self.timer = eTimer()
                if type == HarddiskSetup.HARDDISK_INITIALIZE:
                        text = _("Initializing Harddisk...")
-                       self.timer.timeout.get().append(self.doInit)
+                       self.timer.callback.append(self.doInit)
                else:
                        text = _("Checking Filesystem...")
-                       self.timer.timeout.get().append(self.doCheck)
+                       self.timer.callback.append(self.doCheck)
                self["wait"] = Label(text)
                self.timer.start(100)
 
@@ -39,7 +39,7 @@ class HarddiskSetup(Screen):
                Screen.__init__(self, session)
                self.hdd = hdd
 
-               if type not in [self.HARDDISK_INITIALIZE, self.HARDDISK_CHECK]:
+               if type not in (self.HARDDISK_INITIALIZE, self.HARDDISK_CHECK):
                        self.type = self.HARDDISK_INITIALIZE
                else:
                        self.type = type