diff options
author | Christian Persch <chpe@gnome.org> | 2007-04-30 19:14:27 +0000 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2007-04-30 19:14:27 +0000 |
commit | 1aa8a09fc2b89e5d607c7dcb07697f46c06817fe (patch) | |
tree | 8b0f9b9ea8f2a465642c92f7fc6ea348bbc708b6 /gtk | |
parent | be87e9a8cd6d60250360d99685e368a921a03e05 (diff) | |
download | gtk+-1aa8a09fc2b89e5d607c7dcb07697f46c06817fe.tar.gz |
Make gtk_printer_get_capabilities public, and move the
2007-04-30 Christian Persch <chpe@gnome.org>
* docs/reference/gtk/gtk-sections.txt:
* gtk/gtk.symbols:
* gtk/gtkprinter-private.h:
* gtk/gtkprinter.c: (gtk_printer_get_capabilities),
(gtk_print_capabilities_get_type):
* gtk/gtkprinter.h:
* gtk/gtkprintjob.c:
* gtk/gtkprintjob.h:
* gtk/gtkprintunixdialog.c: (selected_printer_changed):
Make gtk_printer_get_capabilities public, and move the
GtkPrintCapabilities definition to gtkprinter.h. Bug #390437.
svn path=/trunk/; revision=17747
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/gtkprintjob.c | 25 | ||||
-rw-r--r-- | gtk/gtkprintjob.h | 15 |
2 files changed, 0 insertions, 40 deletions
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 0edf240d5f..d9ff9cdc55 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -682,31 +682,6 @@ gtk_print_job_send (GtkPrintJob *job, callback, user_data, dnotify); } -GType -gtk_print_capabilities_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) - { - static const GFlagsValue values[] = { - { GTK_PRINT_CAPABILITY_PAGE_SET, "GTK_PRINT_CAPABILITY_PAGE_SET", "page-set" }, - { GTK_PRINT_CAPABILITY_COPIES, "GTK_PRINT_CAPABILITY_COPIES", "copies" }, - { GTK_PRINT_CAPABILITY_COLLATE, "GTK_PRINT_CAPABILITY_COLLATE", "collate" }, - { GTK_PRINT_CAPABILITY_REVERSE, "GTK_PRINT_CAPABILITY_REVERSE", "reverse" }, - { GTK_PRINT_CAPABILITY_SCALE, "GTK_PRINT_CAPABILITY_SCALE", "scale" }, - { GTK_PRINT_CAPABILITY_GENERATE_PDF, "GTK_PRINT_CAPABILITY_GENERATE_PDF", "generate-pdf" }, - { GTK_PRINT_CAPABILITY_GENERATE_PS, "GTK_PRINT_CAPABILITY_GENERATE_PS", "generate-ps" }, - { GTK_PRINT_CAPABILITY_PREVIEW, "GTK_PRINT_CAPABILITY_PREVIEW", "preview" }, - { 0, NULL, NULL } - }; - - etype = g_flags_register_static (I_("GtkPrintCapabilities"), values); - } - - return etype; -} - #define __GTK_PRINT_JOB_C__ #include "gtkaliasdef.c" diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index 9d538c2cb1..24733d388a 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -34,21 +34,6 @@ G_BEGIN_DECLS #define GTK_IS_PRINT_JOB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_JOB)) #define GTK_PRINT_JOB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_JOB, GtkPrintJobClass)) -/* Note, this type is manually registered with GObject in gtkprintjob.c - * If you add any flags, update the registration as well - */ -typedef enum -{ - GTK_PRINT_CAPABILITY_PAGE_SET = 1 << 0, - GTK_PRINT_CAPABILITY_COPIES = 1 << 1, - GTK_PRINT_CAPABILITY_COLLATE = 1 << 2, - GTK_PRINT_CAPABILITY_REVERSE = 1 << 3, - GTK_PRINT_CAPABILITY_SCALE = 1 << 4, - GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5, - GTK_PRINT_CAPABILITY_GENERATE_PS = 1 << 6, - GTK_PRINT_CAPABILITY_PREVIEW = 1 << 7 -} GtkPrintCapabilities; - typedef struct _GtkPrintJob GtkPrintJob; typedef struct _GtkPrintJobClass GtkPrintJobClass; typedef struct _GtkPrintJobPrivate GtkPrintJobPrivate; |