[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint/cups
From:       Alex Merry <huntedhacker () tiscali ! co ! uk>
Date:       2007-07-04 18:50:16
Message-ID: 1183575016.669584.12582.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 683458 by alexmerry:

Actually, ippDeleteAttribute() is available in CUPS 1.1.19.
We specifically check for it in FindCups.cmake.



 M  +0 -16     ipprequest.cpp  


--- trunk/KDE/kdelibs/kdeprint/cups/ipprequest.cpp #683457:683458
@@ -513,22 +513,6 @@
 	cupsFreeOptions(n, options);
 
 	// find an remove that annoying "document-format" attribute
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
 	ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
 	ippDeleteAttribute(request_, attr);
-#else
-	// (can't use IppDeleteAttribute as older cups doesn't have that)
-	ipp_attribute_t *attr = request_->attrs;
-	while (attr)
-	{
-		if (attr->next && strcmp(attr->next->name, "document-format") == 0)
-		{
-			ipp_attribute_t	*attr2 = attr->next;
-			attr->next = attr2->next;
-			_ipp_free_attr(attr2);
-			break;
-		}
-		attr = attr->next;
-	}
-#endif
 }
[prev in list] [next in list] [prev in thread] [next in thread]