[Freevo-cvslog] freevo/src idle.py,1.5,1.6

[<ou...@us...>]

Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19779

Modified Files:
	idle.py 
Log Message:
Two fallback positions:
    o If the mailbox file doesn't exist on __init__, try the $MAIL variable
    o If the clock font doesn't exist, try the OSD_DEFAULTFONT, this should
      be in the skin, but there isn't a way yet.


Index: idle.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/idle.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** idle.py	19 Feb 2003 16:42:09 -0000	1.5
--- idle.py	19 Feb 2003 16:49:37 -0000	1.6
***************
*** 5,8 ****
--- 5,9 ----
  import sys
  import string
+ import config
  
  sys.path.append('plugins/weather')
***************
*** 18,22 ****
--- 19,30 ----
          self.mail_surface  = osd.getsurface(25,25,225,50)
          self.MAILBOX='/var/mail/aubin'
+         if not os.path.isfile(self.MAILBOX):
+             # XXX Try the mail environment; this might not work if the user runs this
+             # as root, if he starts with 'sudo' it will though.
+             self.MAILBOX=os.environ['MAIL']
          self.CLOCKFONT='skins/fonts/Trebuchet_MS.ttf'
+         if not os.path.isfile(self.CLOCKFONT):
+             # XXX Get this from the skin, but for now this will allow it to work
+             self.CLOCKFONT=config.OSD_DEFAULT_FONTNAME
          self.NO_MAILIMAGE='skins/images/status/newmail_dimmed.png'
          self.MAILIMAGE='skins/images/status/newmail_active.png'
***************
*** 24,30 ****
          self.TVFREE='skins/images/status/television_inactive.png'
          self.METARCODE='CYYZ'
!         self.WEATHERCACHE='/var/cache/freevo/weather'
          self.interval = 300
!         self.tvlockfile = '/var/run/freevo_record.pid'
  
  
--- 32,38 ----
          self.TVFREE='skins/images/status/television_inactive.png'
          self.METARCODE='CYYZ'
!         self.WEATHERCACHE = '/var/cache/freevo/weather'
          self.interval = 300
!         self.tvlockfile = '/var/cache/freevo/record'
  
  
***************
*** 38,42 ****
  
      def checkmail(self):
!         if os.path.isfile(self.MAILBOX):
              mb = mailbox.UnixMailbox (file(self.MAILBOX,'r'))
              msg = mb.next()
--- 46,50 ----
  
      def checkmail(self):
!         if not os.path.isfile(self.MAILBOX):
              mb = mailbox.UnixMailbox (file(self.MAILBOX,'r'))
              msg = mb.next()