aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2007-10-02 02:28:29 +0800
committermarcus <marcus@FreeBSD.org>2007-10-02 02:28:29 +0800
commitbce8b7bd4a3d2e827af6d48f629df9ec0a16103c (patch)
tree9f74852bcaaa61339769b6c1576102d0e64b4497 /x11-toolkits
parenta130f4ae73ca6044e59d0fe1e7ea3c10b0873b6f (diff)
downloadfreebsd-ports-gnome-bce8b7bd4a3d2e827af6d48f629df9ec0a16103c.tar.gz
freebsd-ports-gnome-bce8b7bd4a3d2e827af6d48f629df9ec0a16103c.tar.zst
freebsd-ports-gnome-bce8b7bd4a3d2e827af6d48f629df9ec0a16103c.zip
Fix one more problem with CUPS 1.3. I missed this in the original PR.
Reported by: Scot Hetzel <swhetzel@gmail.com>
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c15
-rw-r--r--x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c15
2 files changed, 26 insertions, 4 deletions
diff --git a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
index db213c989555..612f57b60af0 100644
--- a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ b/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
@@ -1,5 +1,5 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig 2007-09-30 18:40:09.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c 2007-09-30 18:40:45.000000000 -0400
+--- modules/printbackends/cups/gtkcupsutils.c.orig 2007-07-16 15:45:18.000000000 -0400
++++ modules/printbackends/cups/gtkcupsutils.c 2007-10-01 14:27:17.000000000 -0400
@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
httpClearFields(request->http);
httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
@@ -11,3 +11,14 @@
if (httpPost(request->http, request->resource))
{
+@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
+ }
+
+ httpClearFields(request->http);
+-#ifdef HAVE_HTTP_AUTHSTRING
+- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
+-#endif
++ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
+
+ if (httpGet(request->http, request->resource))
+ {
diff --git a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
index db213c989555..612f57b60af0 100644
--- a/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ b/x11-toolkits/gtk30/files/patch-modules_printbackends_cups_gtkcupsutils.c
@@ -1,5 +1,5 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig 2007-09-30 18:40:09.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c 2007-09-30 18:40:45.000000000 -0400
+--- modules/printbackends/cups/gtkcupsutils.c.orig 2007-07-16 15:45:18.000000000 -0400
++++ modules/printbackends/cups/gtkcupsutils.c 2007-10-01 14:27:17.000000000 -0400
@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
httpClearFields(request->http);
httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
@@ -11,3 +11,14 @@
if (httpPost(request->http, request->resource))
{
+@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
+ }
+
+ httpClearFields(request->http);
+-#ifdef HAVE_HTTP_AUTHSTRING
+- httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
+-#endif
++ httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
+
+ if (httpGet(request->http, request->resource))
+ {