diff --git a/ChangeLog b/ChangeLog index 7bbea24..c0fac69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * src/modules/faxsend.{cpp,h} (mainLoop): Likewise. * src/backend/connection.cpp (data_b3_conf): fix behaviour when DATA_B3_CONF comes immediately after DATA_B3_REQ + * scripts/capisuitefax.in: also accept PDF files 2004-01-18 Gernot Hillier * scripts/cs_helpers.pyin (sendMIMEMail): remove space in sox call diff --git a/NEWS b/NEWS index b4cbc90..b1563e5 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ 0.5 (CVS nn): ============= + * scripts: capisuitefax now also accepts PDF files (thx to Jochen Meyer + and Eckhard Rüggeberg for reporting) + * core: fixed a bug which could lead to a crash when some unexpected CAPI messages arrived (thx to Karsten Keil for analyzing) diff --git a/scripts/capisuitefax.in b/scripts/capisuitefax.in index 0d2eb2a..a1fc18e 100755 --- a/scripts/capisuitefax.in +++ b/scripts/capisuitefax.in @@ -4,7 +4,7 @@ # --------------------------------------------------- # copyright : (C) 2002 by Gernot Hillier # email : gernot@hillier.de -# version : $Revision: 1.6 $ +# version : $Revision: 1.7 $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ other options: -h, --help print this usage information -l, --list print jobs in the send queue -The given files must be in Adobe PostScript format""" +The given files must be in Adobe PostScript or PDF format""" if (error!=""): print print "ERROR:",error @@ -186,8 +186,9 @@ for i in args: filetype=t.read() if (t.close()): usage("can't execute \"file\"") - if (not re.search("application/postscript",filetype)): - sys.stderr.write(i+" is not a PostScript file\n") + if (not re.search("application/postscript",filetype) \ + and not re.search("application/pdf",filetype)): + sys.stderr.write(i+" is not a PostScript/PDF file\n") continue newname=cs_helpers.uniqueName(sendq,"fax","sff")