callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a capabilities argument to the printer_get_options method and to the

Browse Source 
2006-06-19  Matthias Clasen  <mclasen@redhat.com>

	* 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.
This commit is contained in:
Matthias Clasen
2006-06-19 05:09:49 +00:00
committed by Matthias Clasen
parent 2858512ebe
commit 7a44ce3366
7 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,5 +1,20 @@
2006-06-19 Matthias Clasen <mclasen@redhat.com> 2006-06-19 Matthias Clasen <mclasen@redhat.com>
* 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.
* gtk/gtkprintjob.h: Add a GENERATE_PS capability. * gtk/gtkprintjob.h: Add a GENERATE_PS capability.
* gtk/gtkprintunixdialog.c (is_printer_active): And use it here. * gtk/gtkprintunixdialog.c (is_printer_active): And use it here.

15
ChangeLog.pre-2-10
View File

@ -1,5 +1,20 @@
2006-06-19 Matthias Clasen <mclasen@redhat.com> 2006-06-19 Matthias Clasen <mclasen@redhat.com>
* 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.
* gtk/gtkprintjob.h: Add a GENERATE_PS capability. * gtk/gtkprintjob.h: Add a GENERATE_PS capability.
* gtk/gtkprintunixdialog.c (is_printer_active): And use it here. * gtk/gtkprintunixdialog.c (is_printer_active): And use it here.

3
gtk/gtkprintbackend.h
View File

@ -87,7 +87,8 @@ struct _GtkPrintBackendClass
gint cache_fd); gint cache_fd);
GtkPrinterOptionSet * (*printer_get_options) (GtkPrinter *printer, GtkPrinterOptionSet * (*printer_get_options) (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup); GtkPageSetup *page_setup,
GtkPrintCapabilities capabilities);
gboolean (*printer_mark_conflicts) (GtkPrinter *printer, gboolean (*printer_mark_conflicts) (GtkPrinter *printer,
GtkPrinterOptionSet *options); GtkPrinterOptionSet *options);
void (*printer_get_settings_from_options) (GtkPrinter *printer, void (*printer_get_settings_from_options) (GtkPrinter *printer,

4
gtk/gtkprinter-private.h
View File

@ -34,8 +34,8 @@ gboolean _gtk_printer_has_details (GtkPrinter
void _gtk_printer_request_details (GtkPrinter *printer); void _gtk_printer_request_details (GtkPrinter *printer);
GtkPrinterOptionSet *_gtk_printer_get_options (GtkPrinter *printer, GtkPrinterOptionSet *_gtk_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup); GtkPageSetup *page_setup,
gboolean _gtk_printer_mark_conflicts (GtkPrinter *printer, GtkPrintCapabilities capabilities);gboolean _gtk_printer_mark_conflicts (GtkPrinter *printer,
GtkPrinterOptionSet *options); GtkPrinterOptionSet *options);
void _gtk_printer_get_settings_from_options (GtkPrinter *printer, void _gtk_printer_get_settings_from_options (GtkPrinter *printer,
GtkPrinterOptionSet *options, GtkPrinterOptionSet *options,

9
gtk/gtkprinter.c
View File

@ -713,12 +713,13 @@ _gtk_printer_request_details (GtkPrinter *printer)
} }
GtkPrinterOptionSet * GtkPrinterOptionSet *
_gtk_printer_get_options (GtkPrinter *printer, _gtk_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup) GtkPageSetup *page_setup,
GtkPrintCapabilities capabilities)
{ {
GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend); GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend);
return backend_class->printer_get_options (printer, settings, page_setup); return backend_class->printer_get_options (printer, settings, page_setup, capabilities);
} }
gboolean gboolean

10
modules/printbackends/lpr/gtkprintbackendlpr.c
View File

@ -67,7 +67,8 @@ static void lpr_printer_get_settings_from_options (GtkPrinter
GtkPrintSettings *settings); GtkPrintSettings *settings);
static GtkPrinterOptionSet *lpr_printer_get_options (GtkPrinter *printer, static GtkPrinterOptionSet *lpr_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup); GtkPageSetup *page_setup,
GtkPrintCapabilities capabilities);
static void lpr_printer_prepare_for_print (GtkPrinter *printer, static void lpr_printer_prepare_for_print (GtkPrinter *printer,
GtkPrintJob *print_job, GtkPrintJob *print_job,
GtkPrintSettings *settings, GtkPrintSettings *settings,
@ -392,9 +393,10 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend)
} }
static GtkPrinterOptionSet * static GtkPrinterOptionSet *
lpr_printer_get_options (GtkPrinter *printer, lpr_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup) GtkPageSetup *page_setup,
GtkPrintCapabilities capabilities)
{ {
GtkPrinterOptionSet *set; GtkPrinterOptionSet *set;
GtkPrinterOption *option; GtkPrinterOption *option;

11
modules/printbackends/pdf/gtkprintbackendpdf.c
View File

@ -39,6 +39,7 @@
#include "gtkprintbackendpdf.h" #include "gtkprintbackendpdf.h"
#include "gtkprinter.h" #include "gtkprinter.h"
#include "gtkprinter-private.h"
typedef struct _GtkPrintBackendPdfClass GtkPrintBackendPdfClass; typedef struct _GtkPrintBackendPdfClass GtkPrintBackendPdfClass;
@ -69,7 +70,8 @@ static void pdf_printer_get_settings_from_options (GtkPrinter
GtkPrintSettings *settings); GtkPrintSettings *settings);
static GtkPrinterOptionSet *pdf_printer_get_options (GtkPrinter *printer, static GtkPrinterOptionSet *pdf_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup); GtkPageSetup *page_setup,
GtkPrintCapabilities capabilities);
static void pdf_printer_prepare_for_print (GtkPrinter *printer, static void pdf_printer_prepare_for_print (GtkPrinter *printer,
GtkPrintJob *print_job, GtkPrintJob *print_job,
GtkPrintSettings *settings, GtkPrintSettings *settings,
@ -367,9 +369,10 @@ gtk_print_backend_pdf_init (GtkPrintBackendPdf *backend)
} }
static GtkPrinterOptionSet * static GtkPrinterOptionSet *
pdf_printer_get_options (GtkPrinter *printer, pdf_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings, GtkPrintSettings *settings,
GtkPageSetup *page_setup) GtkPageSetup *page_setup,
GtkPrintCapabilities capabilities)
{ {
GtkPrinterOptionSet *set; GtkPrinterOptionSet *set;
GtkPrinterOption *option; GtkPrinterOption *option;