Improve wording. String change! (#355128, David Lodge)

[~andy/gtk] / gtk / gtkprinter-private.h

diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index 99ece474b19db903b2e6788d5766b20c8eba91a7..58ea80780b42c829b5858a619960345f528f3305 100644 (file)
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -26,6 +26,7 @@
 #include "gtkprintoperation.h"
 #include "gtkprinteroptionset.h"
 #include "gtkpagesetup.h"
+#include "gtkprintjob.h"
 
 G_BEGIN_DECLS
 
@@ -33,8 +34,8 @@ gboolean             _gtk_printer_has_details               (GtkPrinter
 void                 _gtk_printer_request_details           (GtkPrinter          *printer);
 GtkPrinterOptionSet *_gtk_printer_get_options               (GtkPrinter          *printer,
                                                             GtkPrintSettings    *settings,
-                                                            GtkPageSetup        *page_setup);
-gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
+                                                            GtkPageSetup        *page_setup,
+                                                            GtkPrintCapabilities capabilities);gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
                                                             GtkPrinterOptionSet *options);
 void                 _gtk_printer_get_settings_from_options (GtkPrinter          *printer,
                                                             GtkPrinterOptionSet *options,
@@ -44,9 +45,10 @@ void                 _gtk_printer_prepare_for_print         (GtkPrinter
                                                             GtkPrintSettings    *settings,
                                                             GtkPageSetup        *page_setup);
 cairo_surface_t *    _gtk_printer_create_cairo_surface      (GtkPrinter          *printer,
+                                                            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,
@@ -54,6 +56,7 @@ void                 _gtk_printer_get_hard_margins          (GtkPrinter
                                                             gdouble             *left,
                                                             gdouble             *right);
 GHashTable *         _gtk_printer_get_custom_widgets        (GtkPrinter          *printer);
+GtkPrintCapabilities _gtk_printer_get_capabilities          (GtkPrinter          *printer);
 
 
 /* GtkPrintJob private methods: */