diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-22 13:25:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-22 13:25:25 +0000 |
| commit | 63ba491f4003479d03c8bc8c7993342f2bda2da5 (patch) | |
| tree | 1660f7c07ab66e4855ee6e10fdef96d79325bff7 | |
| parent | e070fdf693197ab73e1189a66b142981ffe35aa8 (diff) | |
| download | gtk+-63ba491f4003479d03c8bc8c7993342f2bda2da5.tar.gz | |
add missing flag values
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkprintjob.c | 2 | ||||
| -rw-r--r-- | gtk/gtkprintjob.h | 3 |
4 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,9 @@ 2006-06-22 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkpintjob.h: Add a note about updating the registration. + * gtk/gtkprintjob.c (gtk_print_capabilites_get_type): Add missing + capabilitites. + * modules/printbackends/cups/gtkprintbackendcups.c: Remove an unused variable and make it compile with Cups 1.1. (#345644, Joseph Sacco) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1a369c0986..91419c107f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-06-22 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkpintjob.h: Add a note about updating the registration. + * gtk/gtkprintjob.c (gtk_print_capabilites_get_type): Add missing + capabilitites. + * modules/printbackends/cups/gtkprintbackendcups.c: Remove an unused variable and make it compile with Cups 1.1. (#345644, Joseph Sacco) diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index d84796b7e3..ce2af9b9d9 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -693,6 +693,8 @@ gtk_print_capabilities_get_type (void) { 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" }, { 0, NULL, NULL } }; diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index 0a205e7438..bb5e299f5e 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -34,6 +34,9 @@ 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, |