aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/Components')
-rw-r--r--lib/python/Components/EventInfo.py5
-rw-r--r--lib/python/Components/MovieList.py5
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/python/Components/EventInfo.py b/lib/python/Components/EventInfo.py
index ac7ed9b5..c8e5a13f 100644
--- a/lib/python/Components/EventInfo.py
+++ b/lib/python/Components/EventInfo.py
@@ -25,13 +25,12 @@ class EventInfo(PerServiceDisplay):
if service != None:
info = service.info()
if info is not None:
- ev = eServiceEventPtr()
- if info.getEvent(ev, self.now_or_next & 1) == 0:
+ ev = info.getEvent(self.now_or_next & 1)
+ if ev is not None:
if self.now_or_next & 2:
self.setText("%d min" % (ev.m_duration / 60))
else:
self.setText(ev.m_event_name)
- print "new event info in EventInfo! yeah!"
def stopEvent(self):
self.setText(
diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py
index 003302b3..5b07791f 100644
--- a/lib/python/Components/MovieList.py
+++ b/lib/python/Components/MovieList.py
@@ -83,9 +83,8 @@ class MovieList(HTMLComponent, GUIComponent):
movieList = [ ]
while 1:
- s = eServiceReference()
- if list.getNext(s):
- del s
+ s = list.getNext()
+ if not s.valid():
del list
break
movieList.append(s)