print: Rename private headers
authorMatthias Clasen <mclasen@redhat.com>
Wed, 7 Jun 2023 02:26:38 +0000 (22:26 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 7 Jun 2023 02:32:18 +0000 (22:32 -0400)
Rename private print-related headers to follow our
naming conventions:
gtkprintutils.h -> gtkprintutilsprivate.h
gtkprinteroption.h -> gtkprinteroptionprivate.h
gtkprinteroptionset.h => gtkprinteroptionsetprivate.h
gtkprinteroptionwidget.h -> gtkprinteroptionwidgetprivate.h

21 files changed:
gtk/gtkcustompaperunixdialog.c
gtk/gtkpagesetup.c
gtk/gtkpagesetupunixdialog.c
gtk/gtkpapersize.c
gtk/gtkprintbackendprivate.h
gtk/gtkprinteroption.c
gtk/gtkprinteroption.h [deleted file]
gtk/gtkprinteroptionprivate.h [new file with mode: 0644]
gtk/gtkprinteroptionset.c
gtk/gtkprinteroptionset.h [deleted file]
gtk/gtkprinteroptionsetprivate.h [new file with mode: 0644]
gtk/gtkprinteroptionwidget.c
gtk/gtkprinteroptionwidget.h [deleted file]
gtk/gtkprinteroptionwidgetprivate.h [new file with mode: 0644]
gtk/gtkprinterprivate.h
gtk/gtkprintsettings.c
gtk/gtkprintunixdialog.c
gtk/gtkprintutils.c
gtk/gtkprintutils.h [deleted file]
gtk/gtkprintutilsprivate.h [new file with mode: 0644]
modules/printbackends/gtkprintbackendcups.c

index f6c9a239fbc1670f0b9425d797f3a158498dd42b..375927e5178cfbd936b64a8fe20ee402ddaf0e75 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackendprivate.h"
-#include "gtkprintutils.h"
+#include "gtkprintutilsprivate.h"
 #include "deprecated/gtkdialogprivate.h"
 
 #define LEGACY_CUSTOM_PAPER_FILENAME ".gtk-custom-papers"
index dae688c4988212785ef72fbbbb01ab0e9c11f5c5..588e43d8e7c99c28c085e53ad8522bd4c909f5e9 100644 (file)
@@ -19,7 +19,7 @@
 #include "config.h"
 
 #include "gtkpagesetup.h"
-#include "gtkprintutils.h"
+#include "gtkprintutilsprivate.h"
 #include "gtkprintoperation.h" /* for GtkPrintError */
 #include <glib/gi18n-lib.h>
 #include "gtktypebuiltins.h"
index 799a7328929113c2825e55f4d2e11157bb1fc9ae..e9f5cfd6ab06d9e0e8909319305473af6c6336dc 100644 (file)
@@ -34,7 +34,7 @@
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackendprivate.h"
 #include "gtkpapersize.h"
-#include "gtkprintutils.h"
+#include "gtkprintutilsprivate.h"
 #include "deprecated/gtkdialogprivate.h"
 
 /**
index 9a2ef889cd2a023cfc634a644f1e2f49c1987db1..97bd96d49c9efd19dea25106e119ac24cd6f31f0 100644 (file)
@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "gtkpapersize.h"
-#include "gtkprintutils.h"
+#include "gtkprintutilsprivate.h"
 #include "gtkprintoperation.h"  /* for GtkPrintError */
 #include <glib/gi18n-lib.h>
 
index ef3be89fef7ef4421979ca8e8fc22cecd2f28678..be14331673f9cdaf076d8da53108a192f77fb93f 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
-#include <gtk/gtkprinteroptionset.h>
+#include <gtk/gtkprinteroptionsetprivate.h>
 
 G_BEGIN_DECLS
 
index d81981eaf340c3df6d153eca36d4704984aab9f3..91e4bdecb9ec43114b70cacb5bdf1421982fde0b 100644 (file)
@@ -21,7 +21,7 @@
 #include <gmodule.h>
 
 #include "gtkprivate.h"
-#include "gtkprinteroption.h"
+#include "gtkprinteroptionprivate.h"
 
 /*****************************************
  *            GtkPrinterOption           *
diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroption.h
deleted file mode 100644 (file)
index 0578e30..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprinteroption.h: printer option
- * Copyright (C) 2006, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkPrintDialog backend modules; no stability guarantees
- * are made at this point
- */
-#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
-#error "GtkPrintBackend is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINTER_OPTION             (gtk_printer_option_get_type ())
-#define GTK_PRINTER_OPTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_OPTION, GtkPrinterOption))
-#define GTK_IS_PRINTER_OPTION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_OPTION))
-
-typedef struct _GtkPrinterOption       GtkPrinterOption;
-typedef struct _GtkPrinterOptionClass  GtkPrinterOptionClass;
-
-#define GTK_PRINTER_OPTION_GROUP_IMAGE_QUALITY "ImageQuality"
-#define GTK_PRINTER_OPTION_GROUP_FINISHING "Finishing"
-
-typedef enum {
-  GTK_PRINTER_OPTION_TYPE_BOOLEAN,
-  GTK_PRINTER_OPTION_TYPE_PICKONE,
-  GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD,
-  GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE,
-  GTK_PRINTER_OPTION_TYPE_PICKONE_REAL,
-  GTK_PRINTER_OPTION_TYPE_PICKONE_INT,
-  GTK_PRINTER_OPTION_TYPE_PICKONE_STRING,
-  GTK_PRINTER_OPTION_TYPE_ALTERNATIVE,
-  GTK_PRINTER_OPTION_TYPE_STRING,
-  GTK_PRINTER_OPTION_TYPE_FILESAVE,
-  GTK_PRINTER_OPTION_TYPE_INFO
-} GtkPrinterOptionType;
-
-struct _GtkPrinterOption
-{
-  GObject parent_instance;
-
-  char *name;
-  char *display_text;
-  GtkPrinterOptionType type;
-
-  char *value;
-
-  int num_choices;
-  char **choices;
-  char **choices_display;
-
-  gboolean activates_default;
-
-  gboolean has_conflict;
-  char *group;
-};
-
-struct _GtkPrinterOptionClass
-{
-  GObjectClass parent_class;
-
-  void (*changed) (GtkPrinterOption *option);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GDK_AVAILABLE_IN_ALL
-GType   gtk_printer_option_get_type       (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_ALL
-GtkPrinterOption *gtk_printer_option_new                    (const char           *name,
-                                                            const char           *display_text,
-                                                            GtkPrinterOptionType  type);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_set                    (GtkPrinterOption     *option,
-                                                            const char           *value);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_set_has_conflict       (GtkPrinterOption     *option,
-                                                            gboolean              has_conflict);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_clear_has_conflict     (GtkPrinterOption     *option);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_set_boolean            (GtkPrinterOption     *option,
-                                                            gboolean              value);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_allocate_choices       (GtkPrinterOption     *option,
-                                                            int                   num);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_choices_from_array     (GtkPrinterOption     *option,
-                                                             int                   num_choices,
-                                                             const char           **choices,
-                                                             const char           **choices_display);
-GDK_AVAILABLE_IN_ALL
-gboolean          gtk_printer_option_has_choice             (GtkPrinterOption     *option,
-                                                           const char           *choice);
-GDK_AVAILABLE_IN_ALL
-void              gtk_printer_option_set_activates_default (GtkPrinterOption     *option,
-                                                           gboolean              activates);
-GDK_AVAILABLE_IN_ALL
-gboolean          gtk_printer_option_get_activates_default (GtkPrinterOption     *option);
-
-
-G_END_DECLS
-
-
-
diff --git a/gtk/gtkprinteroptionprivate.h b/gtk/gtkprinteroptionprivate.h
new file mode 100644 (file)
index 0000000..0578e30
--- /dev/null
@@ -0,0 +1,129 @@
+/* GTK - The GIMP Toolkit
+ * gtkprinteroption.h: printer option
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkPrintDialog backend modules; no stability guarantees
+ * are made at this point
+ */
+#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
+#error "GtkPrintBackend is not supported API for general use"
+#endif
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_PRINTER_OPTION             (gtk_printer_option_get_type ())
+#define GTK_PRINTER_OPTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_OPTION, GtkPrinterOption))
+#define GTK_IS_PRINTER_OPTION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_OPTION))
+
+typedef struct _GtkPrinterOption       GtkPrinterOption;
+typedef struct _GtkPrinterOptionClass  GtkPrinterOptionClass;
+
+#define GTK_PRINTER_OPTION_GROUP_IMAGE_QUALITY "ImageQuality"
+#define GTK_PRINTER_OPTION_GROUP_FINISHING "Finishing"
+
+typedef enum {
+  GTK_PRINTER_OPTION_TYPE_BOOLEAN,
+  GTK_PRINTER_OPTION_TYPE_PICKONE,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_PASSCODE,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_REAL,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_INT,
+  GTK_PRINTER_OPTION_TYPE_PICKONE_STRING,
+  GTK_PRINTER_OPTION_TYPE_ALTERNATIVE,
+  GTK_PRINTER_OPTION_TYPE_STRING,
+  GTK_PRINTER_OPTION_TYPE_FILESAVE,
+  GTK_PRINTER_OPTION_TYPE_INFO
+} GtkPrinterOptionType;
+
+struct _GtkPrinterOption
+{
+  GObject parent_instance;
+
+  char *name;
+  char *display_text;
+  GtkPrinterOptionType type;
+
+  char *value;
+
+  int num_choices;
+  char **choices;
+  char **choices_display;
+
+  gboolean activates_default;
+
+  gboolean has_conflict;
+  char *group;
+};
+
+struct _GtkPrinterOptionClass
+{
+  GObjectClass parent_class;
+
+  void (*changed) (GtkPrinterOption *option);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+GDK_AVAILABLE_IN_ALL
+GType   gtk_printer_option_get_type       (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_ALL
+GtkPrinterOption *gtk_printer_option_new                    (const char           *name,
+                                                            const char           *display_text,
+                                                            GtkPrinterOptionType  type);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_set                    (GtkPrinterOption     *option,
+                                                            const char           *value);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_set_has_conflict       (GtkPrinterOption     *option,
+                                                            gboolean              has_conflict);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_clear_has_conflict     (GtkPrinterOption     *option);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_set_boolean            (GtkPrinterOption     *option,
+                                                            gboolean              value);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_allocate_choices       (GtkPrinterOption     *option,
+                                                            int                   num);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_choices_from_array     (GtkPrinterOption     *option,
+                                                             int                   num_choices,
+                                                             const char           **choices,
+                                                             const char           **choices_display);
+GDK_AVAILABLE_IN_ALL
+gboolean          gtk_printer_option_has_choice             (GtkPrinterOption     *option,
+                                                           const char           *choice);
+GDK_AVAILABLE_IN_ALL
+void              gtk_printer_option_set_activates_default (GtkPrinterOption     *option,
+                                                           gboolean              activates);
+GDK_AVAILABLE_IN_ALL
+gboolean          gtk_printer_option_get_activates_default (GtkPrinterOption     *option);
+
+
+G_END_DECLS
+
+
+
index 333f110bb63093556504fb0ecd372cbf5759d905..288fda6f37e06ac9de601abf91b79b03a6f3b2d8 100644 (file)
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#include "gtkprinteroptionset.h"
+#include "gtkprinteroptionsetprivate.h"
 #include "gtkprivate.h"
 
 /*****************************************
diff --git a/gtk/gtkprinteroptionset.h b/gtk/gtkprinteroptionset.h
deleted file mode 100644 (file)
index 6b00206..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprinteroptionset.h: printer option set
- * Copyright (C) 2006, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* This is a "semi-private" header; it is meant only for
- * alternate GtkPrintDialog backend modules; no stability guarantees
- * are made at this point
- */
-#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
-#error "GtkPrintBackend is not supported API for general use"
-#endif
-
-#include <glib-object.h>
-#include <gdk/gdk.h>
-#include "gtkprinteroption.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINTER_OPTION_SET             (gtk_printer_option_set_get_type ())
-#define GTK_PRINTER_OPTION_SET(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_OPTION_SET, GtkPrinterOptionSet))
-#define GTK_IS_PRINTER_OPTION_SET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_OPTION_SET))
-
-typedef struct _GtkPrinterOptionSet       GtkPrinterOptionSet;
-typedef struct _GtkPrinterOptionSetClass  GtkPrinterOptionSetClass;
-
-struct _GtkPrinterOptionSet
-{
-  GObject parent_instance;
-
-  /*< private >*/
-  GPtrArray *array;
-  GHashTable *hash;
-};
-
-struct _GtkPrinterOptionSetClass
-{
-  GObjectClass parent_class;
-
-  void (*changed) (GtkPrinterOptionSet *option);
-
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-typedef void (*GtkPrinterOptionSetFunc) (GtkPrinterOption  *option,
-                                        gpointer           user_data);
-
-
-GDK_AVAILABLE_IN_ALL
-GType   gtk_printer_option_set_get_type       (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_ALL
-GtkPrinterOptionSet *gtk_printer_option_set_new              (void);
-GDK_AVAILABLE_IN_ALL
-void                 gtk_printer_option_set_add              (GtkPrinterOptionSet     *set,
-                                                             GtkPrinterOption        *option);
-GDK_AVAILABLE_IN_ALL
-void                 gtk_printer_option_set_remove           (GtkPrinterOptionSet     *set,
-                                                             GtkPrinterOption        *option);
-GDK_AVAILABLE_IN_ALL
-GtkPrinterOption *   gtk_printer_option_set_lookup           (GtkPrinterOptionSet     *set,
-                                                             const char              *name);
-GDK_AVAILABLE_IN_ALL
-void                 gtk_printer_option_set_foreach          (GtkPrinterOptionSet     *set,
-                                                             GtkPrinterOptionSetFunc  func,
-                                                             gpointer                 user_data);
-GDK_AVAILABLE_IN_ALL
-void                 gtk_printer_option_set_clear_conflicts  (GtkPrinterOptionSet     *set);
-GDK_AVAILABLE_IN_ALL
-GList *              gtk_printer_option_set_get_groups       (GtkPrinterOptionSet     *set);
-GDK_AVAILABLE_IN_ALL
-void                 gtk_printer_option_set_foreach_in_group (GtkPrinterOptionSet     *set,
-                                                             const char              *group,
-                                                             GtkPrinterOptionSetFunc  func,
-                                                             gpointer                 user_data);
-
-G_END_DECLS
-
diff --git a/gtk/gtkprinteroptionsetprivate.h b/gtk/gtkprinteroptionsetprivate.h
new file mode 100644 (file)
index 0000000..416a82a
--- /dev/null
@@ -0,0 +1,98 @@
+/* GTK - The GIMP Toolkit
+ * gtkprinteroptionset.h: printer option set
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* This is a "semi-private" header; it is meant only for
+ * alternate GtkPrintDialog backend modules; no stability guarantees
+ * are made at this point
+ */
+#ifndef GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
+#error "GtkPrintBackend is not supported API for general use"
+#endif
+
+#include <glib-object.h>
+#include <gdk/gdk.h>
+#include "gtkprinteroptionprivate.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_PRINTER_OPTION_SET             (gtk_printer_option_set_get_type ())
+#define GTK_PRINTER_OPTION_SET(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_OPTION_SET, GtkPrinterOptionSet))
+#define GTK_IS_PRINTER_OPTION_SET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_OPTION_SET))
+
+typedef struct _GtkPrinterOptionSet       GtkPrinterOptionSet;
+typedef struct _GtkPrinterOptionSetClass  GtkPrinterOptionSetClass;
+
+struct _GtkPrinterOptionSet
+{
+  GObject parent_instance;
+
+  /*< private >*/
+  GPtrArray *array;
+  GHashTable *hash;
+};
+
+struct _GtkPrinterOptionSetClass
+{
+  GObjectClass parent_class;
+
+  void (*changed) (GtkPrinterOptionSet *option);
+
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+typedef void (*GtkPrinterOptionSetFunc) (GtkPrinterOption  *option,
+                                        gpointer           user_data);
+
+
+GDK_AVAILABLE_IN_ALL
+GType   gtk_printer_option_set_get_type       (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_ALL
+GtkPrinterOptionSet *gtk_printer_option_set_new              (void);
+GDK_AVAILABLE_IN_ALL
+void                 gtk_printer_option_set_add              (GtkPrinterOptionSet     *set,
+                                                             GtkPrinterOption        *option);
+GDK_AVAILABLE_IN_ALL
+void                 gtk_printer_option_set_remove           (GtkPrinterOptionSet     *set,
+                                                             GtkPrinterOption        *option);
+GDK_AVAILABLE_IN_ALL
+GtkPrinterOption *   gtk_printer_option_set_lookup           (GtkPrinterOptionSet     *set,
+                                                             const char              *name);
+GDK_AVAILABLE_IN_ALL
+void                 gtk_printer_option_set_foreach          (GtkPrinterOptionSet     *set,
+                                                             GtkPrinterOptionSetFunc  func,
+                                                             gpointer                 user_data);
+GDK_AVAILABLE_IN_ALL
+void                 gtk_printer_option_set_clear_conflicts  (GtkPrinterOptionSet     *set);
+GDK_AVAILABLE_IN_ALL
+GList *              gtk_printer_option_set_get_groups       (GtkPrinterOptionSet     *set);
+GDK_AVAILABLE_IN_ALL
+void                 gtk_printer_option_set_foreach_in_group (GtkPrinterOptionSet     *set,
+                                                             const char              *group,
+                                                             GtkPrinterOptionSetFunc  func,
+                                                             gpointer                 user_data);
+
+G_END_DECLS
+
index 958dc5e80f36bb42dfd82ccd78e0ec3ece0662f7..c14a6757615d3de7210ce4afd3bedda8e77690b9 100644 (file)
@@ -36,7 +36,7 @@
 #include "gtkprivate.h"
 #include "gtkstringlist.h"
 
-#include "gtkprinteroptionwidget.h"
+#include "gtkprinteroptionwidgetprivate.h"
 
 /* This defines the max file length that the file chooser
  * button should display. The total length will be
diff --git a/gtk/gtkprinteroptionwidget.h b/gtk/gtkprinteroptionwidget.h
deleted file mode 100644 (file)
index 427eca5..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/* GtkPrinterOptionWidget 
- * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "gtkprinteroption.h"
-#include "gtkbox.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PRINTER_OPTION_WIDGET                  (gtk_printer_option_widget_get_type ())
-#define GTK_PRINTER_OPTION_WIDGET(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidget))
-#define GTK_PRINTER_OPTION_WIDGET_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetClass))
-#define GTK_IS_PRINTER_OPTION_WIDGET(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_OPTION_WIDGET))
-#define GTK_IS_PRINTER_OPTION_WIDGET_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER_OPTION_WIDGET))
-#define GTK_PRINTER_OPTION_WIDGET_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetClass))
-
-
-typedef struct _GtkPrinterOptionWidget         GtkPrinterOptionWidget;
-typedef struct _GtkPrinterOptionWidgetClass    GtkPrinterOptionWidgetClass;
-typedef struct GtkPrinterOptionWidgetPrivate   GtkPrinterOptionWidgetPrivate;
-
-struct _GtkPrinterOptionWidget
-{
-  GtkBox parent_instance;
-
-  GtkPrinterOptionWidgetPrivate *priv;
-};
-
-struct _GtkPrinterOptionWidgetClass
-{
-  GtkBoxClass parent_class;
-
-  void (*changed) (GtkPrinterOptionWidget *widget);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GDK_AVAILABLE_IN_ALL
-GType       gtk_printer_option_widget_get_type           (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_ALL
-GtkWidget   *gtk_printer_option_widget_new                (GtkPrinterOption       *source);
-GDK_AVAILABLE_IN_ALL
-void         gtk_printer_option_widget_set_source         (GtkPrinterOptionWidget *setting,
-                                                          GtkPrinterOption       *source);
-GDK_AVAILABLE_IN_ALL
-gboolean     gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
-GDK_AVAILABLE_IN_ALL
-GtkWidget   *gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
-GDK_AVAILABLE_IN_ALL
-const char *gtk_printer_option_widget_get_value          (GtkPrinterOptionWidget *setting);
-
-G_END_DECLS
-
diff --git a/gtk/gtkprinteroptionwidgetprivate.h b/gtk/gtkprinteroptionwidgetprivate.h
new file mode 100644 (file)
index 0000000..b470cfd
--- /dev/null
@@ -0,0 +1,72 @@
+/* GtkPrinterOptionWidget 
+ * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "gtkprinteroptionprivate.h"
+#include "gtkbox.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_PRINTER_OPTION_WIDGET                  (gtk_printer_option_widget_get_type ())
+#define GTK_PRINTER_OPTION_WIDGET(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidget))
+#define GTK_PRINTER_OPTION_WIDGET_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetClass))
+#define GTK_IS_PRINTER_OPTION_WIDGET(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINTER_OPTION_WIDGET))
+#define GTK_IS_PRINTER_OPTION_WIDGET_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINTER_OPTION_WIDGET))
+#define GTK_PRINTER_OPTION_WIDGET_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINTER_OPTION_WIDGET, GtkPrinterOptionWidgetClass))
+
+
+typedef struct _GtkPrinterOptionWidget         GtkPrinterOptionWidget;
+typedef struct _GtkPrinterOptionWidgetClass    GtkPrinterOptionWidgetClass;
+typedef struct GtkPrinterOptionWidgetPrivate   GtkPrinterOptionWidgetPrivate;
+
+struct _GtkPrinterOptionWidget
+{
+  GtkBox parent_instance;
+
+  GtkPrinterOptionWidgetPrivate *priv;
+};
+
+struct _GtkPrinterOptionWidgetClass
+{
+  GtkBoxClass parent_class;
+
+  void (*changed) (GtkPrinterOptionWidget *widget);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+GDK_AVAILABLE_IN_ALL
+GType       gtk_printer_option_widget_get_type           (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_ALL
+GtkWidget   *gtk_printer_option_widget_new                (GtkPrinterOption       *source);
+GDK_AVAILABLE_IN_ALL
+void         gtk_printer_option_widget_set_source         (GtkPrinterOptionWidget *setting,
+                                                          GtkPrinterOption       *source);
+GDK_AVAILABLE_IN_ALL
+gboolean     gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
+GDK_AVAILABLE_IN_ALL
+GtkWidget   *gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
+GDK_AVAILABLE_IN_ALL
+const char *gtk_printer_option_widget_get_value          (GtkPrinterOptionWidget *setting);
+
+G_END_DECLS
+
index 91c49b5b4dbc02003f63e3f2aa9b47646bcfeed5..409e66ffb3853ee86b094db08d6766c32b5ad713 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
-#include "gtkprinteroptionset.h"
+#include "gtkprinteroptionsetprivate.h"
 
 G_BEGIN_DECLS
 
index 7ca8bbb8c002e61e8b72954b174e20bffa35c14f..5daa6e67119d3c04b84af8e0f6c1260d21d74885 100644 (file)
@@ -24,7 +24,7 @@
 #include <glib/gprintf.h>
 
 #include "gtkprintsettings.h"
-#include "gtkprintutils.h"
+#include "gtkprintutilsprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidget.h"
 
index 3fc7eb2d4dd20a7a3db4cd10f2651785719fcad1..1835002b9a7296e550cfdfc654481be2c7877d6d 100644 (file)
@@ -30,8 +30,8 @@
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackendprivate.h"
 #include "gtkprinterprivate.h"
-#include "gtkprinteroptionwidget.h"
-#include "gtkprintutils.h"
+#include "gtkprinteroptionwidgetprivate.h"
+#include "gtkprintutilsprivate.h"
 
 #include "gtkspinbutton.h"
 #include "gtkimage.h"
index a8e2095b2bfb6715e40da3dce4263572d98cd9c8..105ad08a5c7f2eeaf683a1ebcae1736501986d8b 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "gtkprintutils.h"
+#include "gtkprintutilsprivate.h"
 
 double
 _gtk_print_convert_to_mm (double len, 
diff --git a/gtk/gtkprintutils.h b/gtk/gtkprintutils.h
deleted file mode 100644 (file)
index 9e63e91..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2006, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <gdk/gdk.h>
-#include "gtkenums.h"
-
-
-G_BEGIN_DECLS
-
-#define MM_PER_INCH 25.4
-#define POINTS_PER_INCH 72
-
-double _gtk_print_convert_to_mm   (double len, GtkUnit unit);
-double _gtk_print_convert_from_mm (double len, GtkUnit unit);
-
-G_END_DECLS
-
diff --git a/gtk/gtkprintutilsprivate.h b/gtk/gtkprintutilsprivate.h
new file mode 100644 (file)
index 0000000..9e63e91
--- /dev/null
@@ -0,0 +1,33 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <gdk/gdk.h>
+#include "gtkenums.h"
+
+
+G_BEGIN_DECLS
+
+#define MM_PER_INCH 25.4
+#define POINTS_PER_INCH 72
+
+double _gtk_print_convert_to_mm   (double len, GtkUnit unit);
+double _gtk_print_convert_from_mm (double len, GtkUnit unit);
+
+G_END_DECLS
+
index d5c6acbe48ae136ff1ae201723827d55b3e901a2..ed40db68aa7cf5a65f659d5d0fdb8a891f0f805a 100644 (file)
@@ -57,7 +57,7 @@
 #include "gtkcupssecretsutils.h"
 #include "gtkprintbackendutils.h"
 
-#include <gtkprintutils.h>
+#include <gtkprintutilsprivate.h>
 #include "gtkprivate.h"
 
 #ifdef HAVE_COLORD