diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-06-21 18:16:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-21 18:16:58 +0000 |
| commit | be8f3c72ea1ae469f7f1fa29be40f9e750f9f1ee (patch) | |
| tree | 63caa243387c7436527c20aaecff9d60df7c156d /gtk/gtkprinter.c | |
| parent | a4290e7000a8144a397720e02022d4d5c9ed0395 (diff) | |
| download | gtk+-be8f3c72ea1ae469f7f1fa29be40f9e750f9f1ee.tar.gz | |
Apply a patch by John Palmieri to use buffered io using GIOChannels, clean
2006-06-21 Matthias Clasen <mclasen@redhat.com>
Apply a patch by John Palmieri to use buffered io using
GIOChannels, clean up error handling and support Cups 1.2
api in the printing code.
* acconfig.h:
* configure.in: Detect Cups 1.2
* gtk/gtkdebug.h:
* gtk/gtkmain.c: Add a printing debug key.
* gtk/gtkprintbackend.[hc]: Remove the GError parameter from
gtk_print_backend_print_stream, and take a GIOChannel instead
of an fd.
* gtk/gtkprinter-private.h:
* gtk/gtkprinter.c: Replace the fd parameter of
_gtk_printer_create_cairo_surface by a GIOChannel.
* gtk/gtkprintjob.[hc]: Remove the GError parameter from
gtk_print_job_send and make it return void.
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintjob.c: Adjust callers, add some debugging support.
* modules/printbackends/Makefile.am: Fix DIST_SUBDIRS.
* modules/printbackends/cups/Makefile.am:
* modules/printbackends/lpr/Makefile.am: Add debug CFLAGS.
* modules/printbackends/cups/gtkcupsutils.[hc]:
* modules/printbackends/cups/gtkprintbackendcups.c:
* modules/printbackends/file/gtkprintbackendfile.c:
* modules/printbackends/lpr/gtkprintbackendfile.c: Adapt to
the GIOChannel and GError changes, add debug output
Diffstat (limited to 'gtk/gtkprinter.c')
| -rw-r--r-- | gtk/gtkprinter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index eab78b3f9c..d0320452e9 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -754,12 +754,12 @@ _gtk_printer_create_cairo_surface (GtkPrinter *printer, GtkPrintSettings *settings, gdouble width, gdouble height, - gint cache_fd) + GIOChannel *cache_io) { GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend); return backend_class->printer_create_cairo_surface (printer, settings, - width, height, cache_fd); + width, height, cache_io); } GList * |