From 97cacfeb64cb4f36e3465cd8dcfc91afafd0b97c Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sat, 25 Feb 2012 17:53:32 -0800 Subject: [PATCH 8/9] [Bug 670373] modules/printing/cups/gtkprintbackendcups.c won't build with CUPS 1.6 Having refactored cups_request_printer_list_cb so that the cups version-dependent block size is small enough to be handled in a single ifdef, make the ifdef HAVE_CUPS_API_1_6 block --- modules/printbackends/cups/gtkprintbackendcups.c | 24 +++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index a51f681..c7ee014 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -2018,7 +2018,29 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, removed_printer_checklist = gtk_print_backend_get_printer_list (backend); response = gtk_cups_result_get_response (result); +#ifdef HAVE_CUPS_API_1_6 + for (attr = ippFirstAttribute (response); attr != NULL; + attr = ippNextAttribute (response)) + { + GtkPrinter *printer; + gboolean status_changed = FALSE; + GList *node; + gint i; + PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo); + + /* Skip leading attributes until we hit a printer... + */ + while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER) + attr = ippNextAttribute (response); + if (attr == NULL) + break; + while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) + { + cups_printer_handle_attribute (cups_backend, attr, info); + attr = ippNextAttribute (response); + } +#else for (attr = response->attrs; attr != NULL; attr = attr->next) { GtkPrinter *printer; @@ -2034,12 +2056,12 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend, if (attr == NULL) break; - while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER) { cups_printer_handle_attribute (cups_backend, attr, info); attr = attr->next; } +#endif if (info->printer_name == NULL || (info->printer_uri == NULL && info->member_uris == NULL)) -- 1.7.7.5 (Apple Git-28)