Also move gtk_print_capabilities_get_type() to the new location. Bug

2007-05-01  Christian Persch  <chpe@gnome.org>

	* gtk/gtkprinter.h:
	* gtk/gtkprintjob.h: Also move gtk_print_capabilities_get_type() to
	the new location. Bug #390437.

svn path=/trunk/; revision=17751

diff --git a/ChangeLog b/ChangeLog
index 87f7dbaf1012f6088d7a560db7965840324eb0ed..65a89cd10cf52fae2c845f81d9339804f622f9fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-01  Christian Persch  <chpe@gnome.org>
+
+       * gtk/gtkprinter.h:
+       * gtk/gtkprintjob.h: Also move gtk_print_capabilities_get_type() to
+       the new location. Bug #390437.
+
 2007-04-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtksettings.c (settings_update_color_scheme):

diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 4c14d21bb9aec01d6ea217ef52a3af910feff5c4..85e15c49a4a7564ad5412908169ab178a76f43a5 100644 (file)
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -26,12 +26,7 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
-#define GTK_PRINTER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER, GtkPrinter))
-#define GTK_PRINTER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER, GtkPrinterClass))
-#define GTK_IS_PRINTER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER))
-#define GTK_IS_PRINTER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER))
-#define GTK_PRINTER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER, GtkPrinterClass))
+#define GTK_TYPE_PRINT_CAPABILITIES (gtk_print_capabilities_get_type ())
 
 /* Note, this type is manually registered with GObject in gtkprinter.c
  * If you add any flags, update the registration as well!
@@ -48,6 +43,15 @@ typedef enum
   GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7
 } GtkPrintCapabilities;
 
+GType gtk_print_capabilities_get_type (void) G_GNUC_CONST;
+
+#define GTK_TYPE_PRINTER                  (gtk_printer_get_type ())
+#define GTK_PRINTER(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER, GtkPrinter))
+#define GTK_PRINTER_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER, GtkPrinterClass))
+#define GTK_IS_PRINTER(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER))
+#define GTK_IS_PRINTER_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER))
+#define GTK_PRINTER_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER, GtkPrinterClass))
+
 typedef struct _GtkPrinter          GtkPrinter;
 typedef struct _GtkPrinterClass     GtkPrinterClass;
 typedef struct _GtkPrinterPrivate   GtkPrinterPrivate;

diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 24733d388a57ade1f01b7c3c74d0c85474f5b011..89a3d5bc4c18a31a6e8a7aa8e022aec8f1a66f98 100644 (file)
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -102,8 +102,6 @@ void                     gtk_print_job_send                   (GtkPrintJob
                                                               gpointer                  user_data,
                                                               GDestroyNotify            dnotify);
 
-GType                    gtk_print_capabilities_get_type      (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif /* __GTK_PRINT_JOB_H__ */