diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-01-09 13:54:12 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2015-01-09 13:54:12 +0900 |
| commit | 95aebc56c0871df83d7d2c784e0cede01d84dbfe (patch) | |
| tree | c9cac39327262359c75f10d8844fdab06b49c57c /tdeprint/cups/ipprequest.cpp | |
| parent | fbcd988d866494c3a63daf0e741248e040980f4b (diff) | |
| parent | 608ee3f53763ca7fe4e925e8309525c78d937984 (diff) | |
| download | tdelibs-95aebc56c0871df83d7d2c784e0cede01d84dbfe.tar.gz tdelibs-95aebc56c0871df83d7d2c784e0cede01d84dbfe.zip | |
Merge branch 'r14.0.x' of http://scm.trinitydesktop.org/scm/git/tdelibs into r14.0.x
Diffstat (limited to 'tdeprint/cups/ipprequest.cpp')
| -rw-r--r-- | tdeprint/cups/ipprequest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp index b4e39913d..8a363152b 100644 --- a/tdeprint/cups/ipprequest.cpp +++ b/tdeprint/cups/ipprequest.cpp @@ -407,7 +407,7 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename) } #ifdef HAVE_CUPS_NO_PWD_CACHE -#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2 +#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE ); #else httpSetAuthString( HTTP, NULL, cups_authstring.data() ); @@ -421,7 +421,7 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename) request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1())); #ifdef HAVE_CUPS_NO_PWD_CACHE -#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2 +#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) cups_authstring = HTTP->authstring; #else cups_authstring = httpGetAuthString( HTTP ); @@ -757,7 +757,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts) cupsFreeOptions(n, options); // find an remove that annoying "document-format" attribute -#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 +#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME); ippDeleteAttribute(request_, attr); #else |