gtk+ r20230 - in trunk: . docs/tools gtk modules/printbackends/cups modules/printbackends/lpr tests

[mitch svn gnome org]

Author: mitch
Date: Thu May 29 09:34:53 2008
New Revision: 20230
URL: http://svn.gnome.org/viewvc/gtk+?rev=20230&view=rev

Log:
2008-05-29  Michael Natterer  <mitch imendio org>

	* gtk/Makefile.am
	* gtk/gtkunixprint.h: add a single-include header for the unix
	print stuff.

	* gtk/gtkpagesetupunixdialog.h
	* gtk/gtkprinter.h
	* gtk/gtkprintjob.h
	* gtk/gtkprintunixdialog.h: add single-include guards that #error
	out if GTK_DISABLE_SINGLE_INCLUDES is defined and any of these
	files is included individually.

	* gtk/gtkprintbackend.h
	* gtk/gtkprinter-private.h
	* modules/printbackends/cups/gtkprintbackendcups.c
	* modules/printbackends/cups/gtkprintercups.h
	* modules/printbackends/lpr/gtkprintbackendlpr.c
	* tests/buildertest.c
	* tests/defaultvaluetest.c
	* docs/tools/widgets.c: include <gtk/gtkunixprint.h> instead of
	individual files.



Added:
   trunk/gtk/gtkunixprint.h
Modified:
   trunk/ChangeLog
   trunk/docs/tools/widgets.c
   trunk/gtk/Makefile.am
   trunk/gtk/gtkpagesetupunixdialog.h
   trunk/gtk/gtkprintbackend.h
   trunk/gtk/gtkprinter-private.h
   trunk/gtk/gtkprinter.h
   trunk/gtk/gtkprintjob.h
   trunk/gtk/gtkprintunixdialog.h
   trunk/modules/printbackends/cups/gtkprintbackendcups.c
   trunk/modules/printbackends/cups/gtkprintercups.h
   trunk/modules/printbackends/lpr/gtkprintbackendlpr.c
   trunk/tests/buildertest.c
   trunk/tests/defaultvaluetest.c

Modified: trunk/docs/tools/widgets.c
==============================================================================
--- trunk/docs/tools/widgets.c	(original)
+++ trunk/docs/tools/widgets.c	Thu May 29 09:34:53 2008
@@ -1,5 +1,4 @@
-#include <gtk/gtkprintunixdialog.h>
-#include <gtk/gtkpagesetupunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xatom.h>
 #include <gdkx.h>

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Thu May 29 09:34:53 2008
@@ -337,7 +337,8 @@
 	gtkpagesetupunixdialog.h	\
 	gtkprintunixdialog.h		\
 	gtkprinter.h			\
-	gtkprintjob.h
+	gtkprintjob.h			\
+	gtkunixprint.h
 endif
 
 # Installed header files without compatibility guarantees

Modified: trunk/gtk/gtkpagesetupunixdialog.h
==============================================================================
--- trunk/gtk/gtkpagesetupunixdialog.h	(original)
+++ trunk/gtk/gtkpagesetupunixdialog.h	Thu May 29 09:34:53 2008
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
 #define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
 

Modified: trunk/gtk/gtkprintbackend.h
==============================================================================
--- trunk/gtk/gtkprintbackend.h	(original)
+++ trunk/gtk/gtkprintbackend.h	Thu May 29 09:34:53 2008
@@ -22,18 +22,16 @@
 #define __GTK_PRINT_BACKEND_H__
 
 /* This is a "semi-private" header; it is meant only for
- * alternate GtkPrintDialog backend modules; no stability guarantees 
+ * 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 <cairo.h>
 #include <gtk/gtk.h>
-
-#include "gtkprinteroptionset.h"
-#include "gtkprintjob.h"
+#include <gtk/gtkunixprint.h>
+#include <gtk/gtkprinteroptionset.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gtk/gtkprinter-private.h
==============================================================================
--- trunk/gtk/gtkprinter-private.h	(original)
+++ trunk/gtk/gtkprinter-private.h	Thu May 29 09:34:53 2008
@@ -22,9 +22,8 @@
 #define __GTK_PRINTER_PRIVATE_H__
 
 #include <gtk/gtk.h>
-#include "gtkprinter.h"
+#include <gtk/gtkunixprint.h>
 #include "gtkprinteroptionset.h"
-#include "gtkprintjob.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/gtk/gtkprinter.h
==============================================================================
--- trunk/gtk/gtkprinter.h	(original)
+++ trunk/gtk/gtkprinter.h	Thu May 29 09:34:53 2008
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PRINTER_H__
 #define __GTK_PRINTER_H__
 

Modified: trunk/gtk/gtkprintjob.h
==============================================================================
--- trunk/gtk/gtkprintjob.h	(original)
+++ trunk/gtk/gtkprintjob.h	Thu May 29 09:34:53 2008
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PRINT_JOB_H__
 #define __GTK_PRINT_JOB_H__
 

Modified: trunk/gtk/gtkprintunixdialog.h
==============================================================================
--- trunk/gtk/gtkprintunixdialog.h	(original)
+++ trunk/gtk/gtkprintunixdialog.h	Thu May 29 09:34:53 2008
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtkunixprint.h> can be included directly."
+#endif
+
 #ifndef __GTK_PRINT_UNIX_DIALOG_H__
 #define __GTK_PRINT_UNIX_DIALOG_H__
 

Added: trunk/gtk/gtkunixprint.h
==============================================================================
--- (empty file)
+++ trunk/gtk/gtkunixprint.h	Thu May 29 09:34:53 2008
@@ -0,0 +1,31 @@
+/* GtkUnixPrint
+ *
+ * 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_UNIX_PRINT_H__
+#define __GTK_UNIX_PRINT_H__
+
+#define __GTK_UNIX_PRINT_H_INSIDE__
+
+#include <gtk/gtkpagesetupunixdialog.h>
+#include <gtk/gtkprinter.h>
+#include <gtk/gtkprintjob.h>
+#include <gtk/gtkprintunixdialog.h>
+
+#undef __GTK_UNIX_PRINT_H_INSIDE__
+
+#endif /* __GTK_UNIX_PRINT_H__ */

Modified: trunk/modules/printbackends/cups/gtkprintbackendcups.c
==============================================================================
--- trunk/modules/printbackends/cups/gtkprintbackendcups.c	(original)
+++ trunk/modules/printbackends/cups/gtkprintbackendcups.c	Thu May 29 09:34:53 2008
@@ -41,7 +41,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtkprintbackend.h>
-#include <gtk/gtkprinter.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/gtkprinter-private.h>
 
 #include "gtkprintbackendcups.h"

Modified: trunk/modules/printbackends/cups/gtkprintercups.h
==============================================================================
--- trunk/modules/printbackends/cups/gtkprintercups.h	(original)
+++ trunk/modules/printbackends/cups/gtkprintercups.h	Thu May 29 09:34:53 2008
@@ -24,7 +24,7 @@
 #include <cups/cups.h>
 #include <cups/ppd.h>
 
-#include "gtkprinter.h"
+#include <gtk/gtkunixprint.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/modules/printbackends/lpr/gtkprintbackendlpr.c
==============================================================================
--- trunk/modules/printbackends/lpr/gtkprintbackendlpr.c	(original)
+++ trunk/modules/printbackends/lpr/gtkprintbackendlpr.c	Thu May 29 09:34:53 2008
@@ -34,7 +34,6 @@
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
-#include "gtkprinter.h"
 #include "gtkprinter-private.h"
 
 #include "gtkprintbackendlpr.h"

Modified: trunk/tests/buildertest.c
==============================================================================
--- trunk/tests/buildertest.c	(original)
+++ trunk/tests/buildertest.c	Thu May 29 09:34:53 2008
@@ -26,7 +26,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkprintjob.h>
 
 /* Copied from gtkiconfactory.c; keep in sync! */
 struct _GtkIconSet

Modified: trunk/tests/defaultvaluetest.c
==============================================================================
--- trunk/tests/defaultvaluetest.c	(original)
+++ trunk/tests/defaultvaluetest.c	Thu May 29 09:34:53 2008
@@ -22,7 +22,7 @@
 #define GTK_ENABLE_BROKEN
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 
 static void
 check_property (const char *output,