[xmltv-commit] CVS: xmltv MANIFEST,1.73,1.74 Makefile.PL,1.139,1.140

[Ed A. <ep...@us...>]

Update of /cvsroot/xmltv/xmltv
In directory sc8-pr-cvs1:/tmp/cvs-serv19589

Modified Files:
	MANIFEST Makefile.PL 
Log Message:
Applying Andy Balaam's patch for Tk configuration in environments that
support it (with a few changes).

XMLTV::Ask now has two implementations, AskTerm and AskTk, and chooses
one based on whether Tk is usable.  The grabbers need to use the
XMLTV::Ask routines exclusively when they want to communicate with the
user; in particular this means the new say() routine rather than
print().

I haven't tested the Tk configuration half yet.


Index: MANIFEST
===================================================================
RCS file: /cvsroot/xmltv/xmltv/MANIFEST,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** MANIFEST	5 Jul 2003 18:34:07 -0000	1.73
--- MANIFEST	28 Aug 2003 20:56:57 -0000	1.74
***************
*** 5,8 ****
--- 5,10 ----
  README
  lib/Ask.pm
+ lib/AskTerm.pm
+ lib/AskTk.pm
  lib/XMLTV.pm.PL
  lib/XMLTV.pm.in

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/xmltv/xmltv/Makefile.PL,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** Makefile.PL	26 Aug 2003 21:03:54 -0000	1.139
--- Makefile.PL	28 Aug 2003 20:56:57 -0000	1.140
***************
*** 84,87 ****
--- 84,89 ----
       'lib/Version.pm'             => '$(INST_LIBDIR)/XMLTV/Version.pm',
       'lib/Ask.pm'                 => '$(INST_LIBDIR)/XMLTV/Ask.pm',
+      'lib/AskTk.pm'               => '$(INST_LIBDIR)/XMLTV/AskTk.pm',
+      'lib/AskTerm.pm'             => '$(INST_LIBDIR)/XMLTV/AskTerm.pm',
       'lib/Summarize.pm'           => '$(INST_LIBDIR)/XMLTV/Summarize.pm',
       'lib/IMDB.pm'                => '$(INST_LIBDIR)/XMLTV/IMDB.pm',
***************
*** 153,158 ****
  }
  else {
!     do 'lib/Ask.pm' or die 'could not load lib/Ask.pm, aborting';
!     *ask = \&XMLTV::Ask::askBooleanQuestion;
  }
  
--- 155,160 ----
  }
  else {
!     do 'lib/AskTerm.pm' or die 'could not load lib/AskTerm.pm, aborting';
!     *ask = \&XMLTV::AskTerm::askBooleanQuestion;
  }