Author: dmeyer
Date: Sat Feb 3 18:14:38 2007
New Revision: 9144
Modified:
trunk/core/src/ipc/tvserver.py
trunk/ui/src/tv/tvmenu.py
Log:
do not start guide without epg server
Modified: trunk/core/src/ipc/tvserver.py
==============================================================================
--- trunk/core/src/ipc/tvserver.py (original)
+++ trunk/core/src/ipc/tvserver.py Sat Feb 3 18:14:38 2007
@@ -462,7 +462,10 @@
self.server.rpc('home-theatre.epg.update', None).call()
return True
-
+ def connected(self):
+ return self.server is not None
+
+
def ipc_connect(instance):
# the two objects handling recordings and favorites
return 'tvserver', dict(
Modified: trunk/ui/src/tv/tvmenu.py
==============================================================================
--- trunk/ui/src/tv/tvmenu.py (original)
+++ trunk/ui/src/tv/tvmenu.py Sat Feb 3 18:14:38 2007
@@ -100,13 +100,10 @@
# FIXME: debug, remove me
t1 = time.time()
- # Should we check the validity of the guide here or remove this?
- if False:
- msg = _('The list of TV channels is invalid!\n')
- msg += _('Please check the config file.')
- MessageWindow(msg).show()
+ if not tvserver.epg.connected():
+ MessageWindow(_('TVServer not running')).show()
return
-
+
guide = tvguide.TVGuide(self)
self.pushmenu(guide)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
