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

9 files changed, 80 insertions, 75 deletions

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
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 8f2be6b798..770cbd1700 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -159,7 +159,8 @@ static const GDebugKey gtk_debug_keys[] = {
   {"multihead", GTK_DEBUG_MULTIHEAD},
   {"modules", GTK_DEBUG_MODULES},
   {"geometry", GTK_DEBUG_GEOMETRY},
-  {"icontheme", GTK_DEBUG_ICONTHEME}
+  {"icontheme", GTK_DEBUG_ICONTHEME},
+  {"printing", GTK_DEBUG_PRINTING}
 };
 #endif /* G_ENABLE_DEBUG */
 
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 137312f499..14d6aedcd2 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -576,21 +576,19 @@ gtk_print_backend_find_printer (GtkPrintBackend *backend,
 void
 gtk_print_backend_print_stream (GtkPrintBackend        *backend,
                                 GtkPrintJob            *job,
-                                gint                    data_fd,
+                                GIOChannel             *data_io,
                                 GtkPrintJobCompleteFunc callback,
                                 gpointer                user_data,
-				GDestroyNotify          dnotify,
-				GError                **error)
+				GDestroyNotify          dnotify)
 {
   g_return_if_fail (GTK_IS_PRINT_BACKEND (backend));
 
   GTK_PRINT_BACKEND_GET_CLASS (backend)->print_stream (backend,
 						       job,
-						       data_fd,
+						       data_io,
 						       callback,
 						       user_data,
-						       dnotify,
-						       error);
+						       dnotify);
 }
 
 void
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);
 
diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index 37a23a8bd2..58ea80780b 100644
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -48,7 +48,7 @@ cairo_surface_t *    _gtk_printer_create_cairo_surface      (GtkPrinter
 							     GtkPrintSettings    *settings,
 							     gdouble              width,
 							     gdouble              height,
-							     gint                 cache_fd);
+							     GIOChannel          *cache_io);
 GList  *             _gtk_printer_list_papers               (GtkPrinter          *printer);
 void                 _gtk_printer_get_hard_margins          (GtkPrinter          *printer,
 							     gdouble             *top,
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  *
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index 88f1d58e8f..d84796b7e3 100644
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -47,7 +47,7 @@ struct _GtkPrintJobPrivate
 {
   gchar *title;
 
-  gint spool_file_fd;
+  GIOChannel *spool_io;
   cairo_surface_t *surface;
 
   GtkPrintStatus status;
@@ -183,7 +183,7 @@ gtk_print_job_init (GtkPrintJob *job)
 
   priv = job->priv = GTK_PRINT_JOB_GET_PRIVATE (job); 
 
-  priv->spool_file_fd = -1;
+  priv->spool_io = NULL;
 
   priv->title = g_strdup ("");
   priv->surface = NULL;
@@ -244,10 +244,10 @@ gtk_print_job_finalize (GObject *object)
   GtkPrintJob *job = GTK_PRINT_JOB (object);
   GtkPrintJobPrivate *priv = job->priv;
 
-  if (priv->spool_file_fd >= 0)
+  if (priv->spool_io != NULL)
     {
-      close (priv->spool_file_fd);
-      priv->spool_file_fd = -1;
+      g_io_channel_unref (priv->spool_io);
+      priv->spool_io = NULL;
     }
   
   if (priv->backend)
@@ -414,29 +414,26 @@ gtk_print_job_set_source_file (GtkPrintJob *job,
 			       GError     **error)
 {
   GtkPrintJobPrivate *priv;
+  GError *tmp_error;
+
+  tmp_error = NULL;
 
   g_return_val_if_fail (GTK_IS_PRINT_JOB (job), FALSE);
 
   priv = job->priv;
 
-  priv->spool_file_fd = g_open (filename, O_RDONLY|O_BINARY);
-  if (priv->spool_file_fd < 0)
-    {
-      gchar *display_filename = g_filename_display_name (filename);
-      int save_errno = errno;
-      
-      g_set_error (error,
-                   G_FILE_ERROR,
-                   g_file_error_from_errno (save_errno),
-                   _("Failed to open file '%s': %s"),
-                   display_filename, 
-		   g_strerror (save_errno));
-      
-      g_free (display_filename);
+  priv->spool_io = g_io_channel_new_file (filename, "r", &tmp_error);
+
+  if (tmp_error == NULL)
+    g_io_channel_set_encoding (priv->spool_io, NULL, &tmp_error);
 
+  if (tmp_error != NULL)
+    {
+      g_propagate_error (error, tmp_error);
       return FALSE;
     }
-    return TRUE;
+
+  return TRUE;
 }
 
 /**
@@ -459,7 +456,11 @@ gtk_print_job_get_surface (GtkPrintJob  *job,
   gchar *filename;
   gdouble width, height;
   GtkPaperSize *paper_size;
-  
+  int fd;
+  GError *tmp_error;
+
+  tmp_error = NULL;
+
   g_return_val_if_fail (GTK_IS_PRINT_JOB (job), NULL);
 
   priv = job->priv;
@@ -467,26 +468,46 @@ gtk_print_job_get_surface (GtkPrintJob  *job,
   if (priv->surface)
     return priv->surface;
  
-  g_return_val_if_fail (priv->spool_file_fd == -1, NULL);
+  g_return_val_if_fail (priv->spool_io == NULL, NULL);
  
-  priv->spool_file_fd = g_file_open_tmp ("gtkprint_XXXXXX", 
-					 &filename, 
-					 error);
-  if (priv->spool_file_fd == -1)
-    return NULL;
+  fd = g_file_open_tmp ("gtkprint_XXXXXX", 
+			 &filename, 
+			 &tmp_error);
+  if (fd == -1)
+    {
+      g_propagate_error (error, tmp_error);
+      return NULL;
+    }
 
-  fchmod (priv->spool_file_fd, S_IRUSR | S_IWUSR);
+  fchmod (fd, S_IRUSR | S_IWUSR);
+  
+#ifdef G_ENABLE_DEBUG 
+  /* If we are debugging printing don't delete the tmp files */
+  if (!(gtk_debug_flags & GTK_DEBUG_PRINTING))
+#endif /* G_ENABLE_DEBUG */
   unlink (filename);
 
   paper_size = gtk_page_setup_get_paper_size (priv->page_setup);
   width = gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS);
   height = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
+ 
+  priv->spool_io = g_io_channel_unix_new (fd);
+  g_io_channel_set_close_on_unref (priv->spool_io, TRUE);
+  g_io_channel_set_encoding (priv->spool_io, NULL, &tmp_error);
   
+  if (tmp_error != NULL)
+    {
+      g_io_channel_unref (priv->spool_io);
+      priv->spool_io = NULL;
+      g_propagate_error (error, tmp_error);
+      return NULL;
+    }
+
   priv->surface = _gtk_printer_create_cairo_surface (priv->printer,
 						     priv->settings,
 						     width, height,
-						     priv->spool_file_fd);
- 
+						     priv->spool_io);
+  
   return priv->surface;
 }
 
@@ -629,46 +650,34 @@ gtk_print_job_get_property (GObject    *object,
 /**
  * gtk_print_job_send:
  * @job: a GtkPrintJob
- * @callback: function to call when the job completes
+ * @callback: function to call when the job completes or an error occures
  * @user_data: user data that gets passed to @callback
  * @dnotify: destroy notify for @user_data
- * @error: return location for errors, or %NULL
  * 
  * Sends the print job off to the printer.  
  * 
- * Return value: %FALSE if an error occurred
- *
  * Since: 2.10
  **/
-gboolean
+void
 gtk_print_job_send (GtkPrintJob             *job,
                     GtkPrintJobCompleteFunc  callback,
                     gpointer                 user_data,
-		    GDestroyNotify           dnotify,
-		    GError                 **error)
+		    GDestroyNotify           dnotify)
 {
   GtkPrintJobPrivate *priv;
-  GError *print_error = NULL;
 
-  g_return_val_if_fail (GTK_IS_PRINT_JOB (job), FALSE);
+  g_return_if_fail (GTK_IS_PRINT_JOB (job));
 
   priv = job->priv;
-  g_return_val_if_fail (priv->spool_file_fd > 0, FALSE);
+  g_return_if_fail (priv->spool_io != NULL);
   
   gtk_print_job_set_status (job, GTK_PRINT_STATUS_SENDING_DATA);
-  lseek (priv->spool_file_fd, 0, SEEK_SET);
+  
+  g_io_channel_seek_position (priv->spool_io, 0, G_SEEK_SET, NULL);
+  
   gtk_print_backend_print_stream (priv->backend, job,
-				  priv->spool_file_fd,
-                                  callback, user_data, dnotify,
-				  &print_error);
-  if (print_error)
-    {
-      g_propagate_error (error, print_error);
-
-      return FALSE;
-    }
-
-  return TRUE;
+				  priv->spool_io,
+                                  callback, user_data, dnotify);
 }
 
 GType
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index ae71832a9a..0a205e7438 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -108,11 +108,10 @@ cairo_surface_t         *gtk_print_job_get_surface            (GtkPrintJob
 void                     gtk_print_job_set_track_print_status (GtkPrintJob              *job,
 							       gboolean                  track_status);
 gboolean                 gtk_print_job_get_track_print_status (GtkPrintJob              *job);
-gboolean                 gtk_print_job_send                   (GtkPrintJob              *job,
+void                     gtk_print_job_send                   (GtkPrintJob              *job,
 							       GtkPrintJobCompleteFunc   callback,
 							       gpointer                  user_data,
-							       GDestroyNotify            dnotify,
-							       GError                  **error);
+							       GDestroyNotify            dnotify);
 
 GType                    gtk_print_capabilities_get_type      (void) G_GNUC_CONST;
 
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index a8fbd03eee..126771491d 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -306,8 +306,7 @@ unix_end_run (GtkPrintOperation *op,
   if (op_unix->job != NULL)
     gtk_print_job_send (op_unix->job,
                         unix_finish_send, 
-                        op_unix, NULL,
-		        NULL);
+                        op_unix, NULL);
 
   if (wait)
     {