From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 12 Feb 2009 16:05:27 +0000 (+0100)
Subject: Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
X-Git-Tag: 2.6.0~350^2~14
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/d839a9dc005a469e4509d07305cdf3b4913d3ec1?hp=2728b4ae124c0cde02d5a55a6ee52c19e4c2b822

Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
---

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 9b28bd8f..31a32563 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, InfoBarExtensions):
+		InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins):
 
 	ENABLE_RESUME_SUPPORT = True
 	ALLOW_SUSPEND = True
@@ -144,7 +144,8 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
 				InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
 				InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
 				InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
-				InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions:
+				InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions, \
+				InfoBarPlugins:
 			x.__init__(self)
 
 		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()