Author: dmeyer
Date: Mon Apr 16 19:12:02 2007
New Revision: 9469

Modified:
   trunk/ui/src/tv/plugins/guide.py

Log:
check every time if connected to kaa.epg

Modified: trunk/ui/src/tv/plugins/guide.py
==============================================================================
--- trunk/ui/src/tv/plugins/guide.py    (original)
+++ trunk/ui/src/tv/plugins/guide.py    Mon Apr 16 19:12:02 2007
@@ -38,9 +38,6 @@
 import kaa.epg
 import kaa.notifier
 
-# freevo core imports
-import freevo.ipc
-
 # freevo imports
 from freevo.ui.event import *
 from freevo.ui.mainmenu import MainMenuPlugin
@@ -48,9 +45,6 @@
 from freevo.ui.tv.program import ProgramItem
 from freevo.ui.application import MessageWindow
 
-# get tvserver interface
-tvserver = freevo.ipc.Instance('freevo').tvserver
-
 # get logging object
 log = logging.getLogger('tv')
 
@@ -60,7 +54,7 @@
         return [ ActionItem(_('TV Guide'), parent, self.show) ]
 
     def show(self, parent):
-        if not tvserver.epg.connected():
+        if not kaa.epg.is_connected():
             MessageWindow(_('TVServer not running')).show()
             return
         guide = TVGuide(parent)
@@ -110,6 +104,11 @@
         # TODO: keep a cache of program objects for the current guide view
         #       unless this happens to be fast enough
 
+        if not kaa.epg.is_connected():
+            MessageWindow(_('TVServer not running')).show()
+            # FIXME: go back in menu
+            return
+
         if not timestamp:
             timestamp = self.current_time
 

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to