Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv11723
Modified Files:
tvguide.py
Log Message:
CVS has very weird merging behaviour. Both Rob and I made the same bugfix
and it appeared to add both. I'm removing the dupe code since it's quite
dumb to have it twice.
Index: tvguide.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tvguide.py 30 May 2003 03:29:09 -0000 1.7
--- tvguide.py 30 May 2003 03:40:39 -0000 1.8
***************
*** 10,13 ****
--- 10,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.8 2003/05/30 03:40:39 outlyer
+ # CVS has very weird merging behaviour. Both Rob and I made the same bugfix
+ # and it appeared to add both. I'm removing the dupe code since it's quite
+ # dumb to have it twice.
+ #
# Revision 1.7 2003/05/30 03:29:09 outlyer
# Added missing direction events (UP/DOWN/LEFT/RIGHT) to TV Guide.
***************
*** 123,142 ****
self.player('tv', self.selected.channel_id)
- elif event == em.MENU_DOWN:
- self.event_DOWN()
- self.menuw.refresh()
-
- elif event == em.MENU_UP:
- self.event_UP()
- self.menuw.refresh()
-
- elif event == em.MENU_RIGHT:
- self.event_RIGHT()
- self.menuw.refresh()
-
- elif event == em.MENU_LEFT:
- self.event_LEFT()
- self.menuw.refresh()
-
elif event == em.PLAY_END:
self.show()
--- 128,131 ----
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
