Attachment #396440 for bug #540044

View | Details | Raw Unified | Return to bug 540044
Collapse All | Expand All




        response = request.sendIppRequest();
    } while (retry("/", operation));

#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
    if (response && ippGetStatusCode(response) == IPP_OK) {
#else
    if (response && response->request.status.status_code == IPP_OK) {
#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
        ipp_attribute_t *attr;
        if (subscriptionId >= 0) {
            // Request was ok, just return the current subscription

            kWarning() << "No notify-subscription-id in response!";
            ret = -1;
        } else {
#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
            ret = ippGetInteger(attr, 0);
        }
    } else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {

        kDebug() << "Subscription not found";
        // When the subscription is not found try to get a new one
        return renewDBusSubscription(-1, leaseDuration, events);
#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
    } else {
        kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);
        // When the server stops/restarts we will have some error so ignore it

    ipp_attribute_t *attr;
    ReturnArguments ret;

#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
    QVariantHash destAttributes;
    for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
        // We hit an attribute sepparator

            break;
        }
    }
#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)

    return ret;
}

QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
{
    QVariant ret;
#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
    switch (ippGetValueTag(attr)) {
    case IPP_TAG_INTEGER:
    case IPP_TAG_ENUM:

            ret = values;
        }
    }
#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
    return ret;
}


Return to bug 540044

Lines 377-387 Link Here

(-)b/libkcups/KCupsConnection.cpp (-8 / +8 lines)
377	response = request.sendIppRequest();	377	response = request.sendIppRequest();
378	} while (retry("/", operation));	378	} while (retry("/", operation));
379		379
380	#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	380	#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
381	if (response && ippGetStatusCode(response) == IPP_OK) {	381	if (response && ippGetStatusCode(response) == IPP_OK) {
382	#else	382	#else
383	if (response && response->request.status.status_code == IPP_OK) {	383	if (response && response->request.status.status_code == IPP_OK) {
384	#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	384	#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
385	ipp_attribute_t *attr;	385	ipp_attribute_t *attr;
386	if (subscriptionId >= 0) {	386	if (subscriptionId >= 0) {
387	// Request was ok, just return the current subscription	387	// Request was ok, just return the current subscription
Lines 392-398 Link Here
392	kWarning() << "No notify-subscription-id in response!";	392	kWarning() << "No notify-subscription-id in response!";
393	ret = -1;	393	ret = -1;
394	} else {	394	} else {
395	#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	395	#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
396	ret = ippGetInteger(attr, 0);	396	ret = ippGetInteger(attr, 0);
397	}	397	}
398	} else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {	398	} else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {
Lines 406-412 Link Here
406	kDebug() << "Subscription not found";	406	kDebug() << "Subscription not found";
407	// When the subscription is not found try to get a new one	407	// When the subscription is not found try to get a new one
408	return renewDBusSubscription(-1, leaseDuration, events);	408	return renewDBusSubscription(-1, leaseDuration, events);
409	#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	409	#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
410	} else {	410	} else {
411	kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);	411	kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);
412	// When the server stops/restarts we will have some error so ignore it	412	// When the server stops/restarts we will have some error so ignore it
Lines 582-588 Link Here
582	ipp_attribute_t *attr;	582	ipp_attribute_t *attr;
583	ReturnArguments ret;	583	ReturnArguments ret;
584		584
585	#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	585	#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
586	QVariantHash destAttributes;	586	QVariantHash destAttributes;
587	for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {	587	for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
588	// We hit an attribute sepparator	588	// We hit an attribute sepparator
Lines 659-665 Link Here
659	break;	659	break;
660	}	660	}
661	}	661	}
662	#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	662	#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
663		663
664	return ret;	664	return ret;
665	}	665	}
Lines 667-673 Link Here
667	QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)	667	QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
668	{	668	{
669	QVariant ret;	669	QVariant ret;
670	#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	670	#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
671	switch (ippGetValueTag(attr)) {	671	switch (ippGetValueTag(attr)) {
672	case IPP_TAG_INTEGER:	672	case IPP_TAG_INTEGER:
673	case IPP_TAG_ENUM:	673	case IPP_TAG_ENUM:
Lines 760-766 Link Here
760	ret = values;	760	ret = values;
761	}	761	}
762	}	762	}
763	#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6	763	#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
764	return ret;	764	return ret;
765	}	765	}
766		766