aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-12 16:49:17 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-12 16:49:17 +0100
commit89a55fb89dbfb1d78255b48a50a8b4d28e83cdef (patch)
treeaa3a6dd046bd540d8b4c622763721063d178cbce /lib/python/Screens
parentbbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (diff)
parent1bd22cc97199c878255925ef2a9032881acef470 (diff)
downloadenigma2-89a55fb89dbfb1d78255b48a50a8b4d28e83cdef.tar.gz
enigma2-89a55fb89dbfb1d78255b48a50a8b4d28e83cdef.zip
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/InfoBar.py4
-rw-r--r--lib/python/Screens/InfoBarGenerics.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 01b77f3f..baa9e5f2 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -126,7 +126,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
- InfoBarServiceErrorPopupSupport):
+ InfoBarServiceErrorPopupSupport, InfobarExtensions):
ENABLE_RESUME_SUPPORT = True
ALLOW_SUSPEND = True
@@ -144,7 +144,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
- InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:
+ InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfobarExtensions:
x.__init__(self)
self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 89a6b8e3..e64081e6 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1230,7 +1230,7 @@ class InfoBarExtensions:
self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
{
"extensions": (self.showExtensionSelection, _("view extensions...")),
- })
+ }, 1) # lower priority
def addExtension(self, extension, key = None, type = EXTENSION_SINGLE):
self.list.append((type, extension, key))