From be8f3c72ea1ae469f7f1fa29be40f9e750f9f1ee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 21 Jun 2006 18:16:58 +0000 Subject: Apply a patch by John Palmieri to use buffered io using GIOChannels, clean 2006-06-21 Matthias Clasen 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 --- gtk/gtkdebug.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gtk/gtkdebug.h') diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h index 2edfb41575..c70c61768a 100644 --- a/gtk/gtkdebug.h +++ b/gtk/gtkdebug.h @@ -41,7 +41,8 @@ typedef enum { GTK_DEBUG_MULTIHEAD = 1 << 6, GTK_DEBUG_MODULES = 1 << 7, GTK_DEBUG_GEOMETRY = 1 << 8, - GTK_DEBUG_ICONTHEME = 1 << 9 + GTK_DEBUG_ICONTHEME = 1 << 9, + GTK_DEBUG_PRINTING = 1 << 10 } GtkDebugFlag; #ifdef G_ENABLE_DEBUG -- cgit v1.2.1