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/gtkprintbackend.h | |
| 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/gtkprintbackend.h')
| -rw-r--r-- | gtk/gtkprintbackend.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h index abebbd1155..ea2f0f7d9b 100644 --- a/gtk/gtkprintbackend.h +++ b/gtk/gtkprintbackend.h @@ -73,11 +73,10 @@ struct _GtkPrintBackendClass void (*request_printer_list) (GtkPrintBackend *backend); void (*print_stream) (GtkPrintBackend *backend, GtkPrintJob *job, - gint data_fd, + GIOChannel *data_io, GtkPrintJobCompleteFunc callback, gpointer user_data, - GDestroyNotify dnotify, - GError **error); + GDestroyNotify dnotify); /* Printer methods: */ void (*printer_request_details) (GtkPrinter *printer); @@ -85,7 +84,7 @@ struct _GtkPrintBackendClass GtkPrintSettings *settings, gdouble height, gdouble width, - gint cache_fd); + GIOChannel *cache_io); GtkPrinterOptionSet * (*printer_get_options) (GtkPrinter *printer, GtkPrintSettings *settings, GtkPageSetup *page_setup, @@ -135,11 +134,10 @@ GtkPrinter *gtk_print_backend_find_printer (GtkPrintBackend *pri const gchar *printer_name); void gtk_print_backend_print_stream (GtkPrintBackend *print_backend, GtkPrintJob *job, - gint data_fd, + GIOChannel *data_io, GtkPrintJobCompleteFunc callback, gpointer user_data, - GDestroyNotify dnotify, - GError **error); + GDestroyNotify dnotify); GList * gtk_print_backend_load_modules (void); void gtk_print_backend_destroy (GtkPrintBackend *print_backend); |