From 7e480bb4b8d0004cc23a9d3e28deb3297a37c1cf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Oct 2006 18:19:15 +0000 Subject: [PATCH] Complete the fix for bug 357280 --- ChangeLog | 5 +++++ modules/printbackends/cups/gtkcupsutils.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 90973ed820..3e0b5f4010 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,15 @@ 2006-10-03 Matthias Clasen + + * gtk/gtkprintsettings.c (gtk_print_settings_get_duplex): + Fix a typo. (#359052, Ghee Teo) + * gtk/*.c, gdk/*.c: Apply a patch by Behdad Esfahbod to reduce relocations. (#359053) 2006-10-03 Matthias Clasen + * modules/printbackends/cups/gtkcupsutils.c: * modules/printbackends/cups/gtkprintbackendcups.c: Complete the fix for bug 357280. diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c index d2c5462554..a19639783d 100644 --- a/modules/printbackends/cups/gtkcupsutils.c +++ b/modules/printbackends/cups/gtkcupsutils.c @@ -30,6 +30,10 @@ #include #include +#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 20) +#define HAVE_HTTP_AUTHSTRING 1 +#endif + typedef void (*GtkCupsRequestStateFunc) (GtkCupsRequest *request); static void _connect (GtkCupsRequest *request); @@ -534,7 +538,9 @@ _post_send (GtkCupsRequest *request) httpClearFields(request->http); httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length); httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp"); +#ifdef HAVE_HTTP_AUTHSTRING httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring); +#endif if (httpPost(request->http, request->resource)) { @@ -821,7 +827,9 @@ _get_send (GtkCupsRequest *request) } httpClearFields(request->http); +#ifdef HAVE_HTTP_AUTHSTRING httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring); +#endif if (httpGet(request->http, request->resource)) {