summaryrefslogtreecommitdiff
path: root/modules/printbackends/cups/gtkprintbackendcups.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2006-06-16 05:08:14 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-06-16 05:08:14 +0000
commit0f0e499c12c77b246de20a649cfe4c30810dc765 (patch)
tree01b09fb88a4f96f851718694998f67c22eb841e3 /modules/printbackends/cups/gtkprintbackendcups.c
parent82743b9f21ac8071b630c067b779a6d5ae6fc647 (diff)
downloadgdk-pixbuf-0f0e499c12c77b246de20a649cfe4c30810dc765.tar.gz
fix 345038
Diffstat (limited to 'modules/printbackends/cups/gtkprintbackendcups.c')
-rw-r--r--modules/printbackends/cups/gtkprintbackendcups.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 54434c23c..574b7dd76 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -41,6 +41,7 @@
#include <gtk/gtkprintsettings.h>
#include <gtk/gtkprintbackend.h>
#include <gtk/gtkprinter.h>
+#include <gtk/gtkprinter-private.h>
#include "gtkprintbackendcups.h"
#include "gtkprintercups.h"
@@ -151,6 +152,7 @@ static void gtk_print_backend_cups_print_stream (GtkPrintBack
gpointer user_data,
GDestroyNotify dnotify);
static cairo_surface_t * cups_printer_create_cairo_surface (GtkPrinter *printer,
+ GtkPrintSettings *settings,
gdouble width,
gdouble height,
gint cache_fd);
@@ -266,6 +268,7 @@ _cairo_write_to_cups (void *cache_fd_as_pointer,
static cairo_surface_t *
cups_printer_create_cairo_surface (GtkPrinter *printer,
+ GtkPrintSettings *settings,
gdouble width,
gdouble height,
gint cache_fd)
@@ -277,7 +280,7 @@ cups_printer_create_cairo_surface (GtkPrinter *printer,
surface = cairo_ps_surface_create_for_stream (_cairo_write_to_cups, GINT_TO_POINTER (cache_fd), width, height);
/* TODO: DPI from settings object? */
- cairo_ps_surface_set_dpi (surface, 300, 300);
+ cairo_surface_set_fallback_resolution (surface, 300, 300);
return surface;
}
@@ -1180,7 +1183,7 @@ cups_request_ppd (GtkPrinter *printer)
cups_printer = GTK_PRINTER_CUPS (printer);
error = NULL;
-
+ /* FIXME this can return NULL! */
http = httpConnectEncrypt(cups_printer->hostname,
cups_printer->port,
cupsEncryption());
@@ -1219,7 +1222,7 @@ cups_request_ppd (GtkPrinter *printer)
cups_printer->reading_ppd = TRUE;
print_backend = gtk_printer_get_backend (printer);
-
+
cups_request_execute (GTK_PRINT_BACKEND_CUPS (print_backend),
request,
(GtkPrintCupsResponseCallbackFunc) cups_request_ppd_cb,