X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c2cba9ccb6f754aac9378e2fc2c7b546e6d589c..139531c95ab1bd9ea0da563d43a3d8677b937aa9:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index cdaa2c1e..79747a61 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -348,14 +348,14 @@ class InfoBarMenu:
 
 	def mainMenu(self):
 		print "loading mainmenu XML..."
-		menu = mdom.childNodes[0]
-		assert menu.tagName == "menu", "root element in menu must be 'menu'!"
+		menu = mdom.getroot()
+		assert menu.tag == "menu", "root element in menu must be 'menu'!"
 
 		self.session.infobar = self
 		# so we can access the currently active infobar from screens opened from within the mainmenu
 		# at the moment used from the SubserviceSelection
 
-		self.session.openWithCallback(self.mainMenuClosed, MainMenu, menu, menu.childNodes)
+		self.session.openWithCallback(self.mainMenuClosed, MainMenu, menu)
 
 	def mainMenuClosed(self, *val):
 		self.session.infobar = None
@@ -403,7 +403,7 @@ class InfoBarEPG:
 		self.eventView = None
 		self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
 			{
-				"showEventView": (self.openEventView, _("show EPG...")),
+				"showEventInfo": (self.openEventView, _("show EPG...")),
 				"showEventInfoPlugin": (self.showEventInfoPlugins, _("show single service EPG...")),
 				"showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
 			})
@@ -1312,7 +1312,6 @@ class InfoBarJobman:
 		self.session.openWithCallback(self.JobViewCB, JobView, job)
 	
 	def JobViewCB(self, in_background):
-		from Screens.TaskView import JobView
 		job_manager.in_background = in_background
 
 # depends on InfoBarExtensions
@@ -1428,8 +1427,8 @@ class InfoBarInstantRecord:
 		except:
 			pass
 
-		begin = time()
-		end = time() + 3600 * 24 * 365 * 1 # 1 year
+		begin = int(time())
+		end = begin + 3600 * 24 * 365 * 1 # 1 year
 		name = "instant record"
 		description = ""
 		eventid = None
@@ -1535,7 +1534,7 @@ class InfoBarInstantRecord:
 			print "stopping recording after", int(value), "minutes."
 			if int(value) != 0:
 				self.recording[self.selectedEntry].autoincrease = False
-			self.recording[self.selectedEntry].end = time() + 60 * int(value)
+			self.recording[self.selectedEntry].end = int(time()) + 60 * int(value)
 			self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
 
 	def instantRecord(self):