From 7a44ce336669e7c3ac6418a7dbe8171a6749b49b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 19 Jun 2006 05:09:49 +0000 Subject: Add a capabilities argument to the printer_get_options method and to the 2006-06-19 Matthias Clasen * gtk/gtkprinter-private.h: * gtk/gtkprinter.c (_gtk_printer_get_options): * gtk/gtkprintbackend.h: Add a capabilities argument to the printer_get_options method and to the _gtk_printer_get_options function * modules/printbackends/lpr/gtkprintbackendlpr.c (lpr_printer_get_options): * modules/printbackends/pdf/gtkprintbackendpdf.c (pdf_printer_get_options): * modules/printbackends/cups/gtkprintbackendcups.c (cups_printer_get_options): * gtk/gtkprintunixdialog.c (selected_printer_changed): Adjust callers and implementations. --- modules/printbackends/lpr/gtkprintbackendlpr.c | 10 ++++++---- modules/printbackends/pdf/gtkprintbackendpdf.c | 11 +++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'modules') diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c index d045208363..29a94d6901 100644 --- a/modules/printbackends/lpr/gtkprintbackendlpr.c +++ b/modules/printbackends/lpr/gtkprintbackendlpr.c @@ -67,7 +67,8 @@ static void lpr_printer_get_settings_from_options (GtkPrinter GtkPrintSettings *settings); static GtkPrinterOptionSet *lpr_printer_get_options (GtkPrinter *printer, GtkPrintSettings *settings, - GtkPageSetup *page_setup); + GtkPageSetup *page_setup, + GtkPrintCapabilities capabilities); static void lpr_printer_prepare_for_print (GtkPrinter *printer, GtkPrintJob *print_job, GtkPrintSettings *settings, @@ -392,9 +393,10 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend) } static GtkPrinterOptionSet * -lpr_printer_get_options (GtkPrinter *printer, - GtkPrintSettings *settings, - GtkPageSetup *page_setup) +lpr_printer_get_options (GtkPrinter *printer, + GtkPrintSettings *settings, + GtkPageSetup *page_setup, + GtkPrintCapabilities capabilities) { GtkPrinterOptionSet *set; GtkPrinterOption *option; diff --git a/modules/printbackends/pdf/gtkprintbackendpdf.c b/modules/printbackends/pdf/gtkprintbackendpdf.c index 1a362a7260..81b9c07f75 100644 --- a/modules/printbackends/pdf/gtkprintbackendpdf.c +++ b/modules/printbackends/pdf/gtkprintbackendpdf.c @@ -39,6 +39,7 @@ #include "gtkprintbackendpdf.h" #include "gtkprinter.h" +#include "gtkprinter-private.h" typedef struct _GtkPrintBackendPdfClass GtkPrintBackendPdfClass; @@ -69,7 +70,8 @@ static void pdf_printer_get_settings_from_options (GtkPrinter GtkPrintSettings *settings); static GtkPrinterOptionSet *pdf_printer_get_options (GtkPrinter *printer, GtkPrintSettings *settings, - GtkPageSetup *page_setup); + GtkPageSetup *page_setup, + GtkPrintCapabilities capabilities); static void pdf_printer_prepare_for_print (GtkPrinter *printer, GtkPrintJob *print_job, GtkPrintSettings *settings, @@ -367,9 +369,10 @@ gtk_print_backend_pdf_init (GtkPrintBackendPdf *backend) } static GtkPrinterOptionSet * -pdf_printer_get_options (GtkPrinter *printer, - GtkPrintSettings *settings, - GtkPageSetup *page_setup) +pdf_printer_get_options (GtkPrinter *printer, + GtkPrintSettings *settings, + GtkPageSetup *page_setup, + GtkPrintCapabilities capabilities) { GtkPrinterOptionSet *set; GtkPrinterOption *option; -- cgit v1.2.1