meta/plugin_graphmultiepg.xml: fix merge conflict

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 287847baf93247c1ec01a8e355c47afb993d01e3..f0bf773d6a28a76418984bbad84811eba4835766 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile
 
 profile("LOAD:GUISkin")
 from Components.GUISkin import GUISkin
@@ -9,11 +9,13 @@ from Components.GUIComponent import GUIComponent
 
 class Screen(dict, GUISkin):
 
+       False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
        ALLOW_SUSPEND = False
 
        global_screen = None
 
        def __init__(self, session, parent = None):
+               dict.__init__(self)
                self.skinName = self.__class__.__name__
                self.session = session
                self.parent = parent