From c75c6bf4441e85bb83ef3ac2118a3c7bd5fa98d5 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Fri, 23 May 2008 14:55:43 +0000
Subject: [PATCH] perf/widgets.h tests/print-editor.c tests/prop-editor.h

2008-05-23  Michael Natterer  <mitch@gimp.org>

	* perf/widgets.h
	* tests/print-editor.c
	* tests/prop-editor.h
	* tests/testmountoperation.c
	* tests/testmultidisplay.c
	* tests/testnouiprint.c
	* tests/testprint.c
	* tests/testprintfileoperation.h
	* tests/testtreesort.c
	* tests/textbuffertest.c: include <gtk/gtk.h> instead of single
	files. Remove some redundant includes.


svn path=/trunk/; revision=20128
---
 ChangeLog                      | 14 ++++++++++++++
 perf/widgets.h                 |  2 +-
 tests/print-editor.c           |  1 -
 tests/prop-editor.h            |  3 ++-
 tests/testmountoperation.c     |  1 -
 tests/testmultidisplay.c       |  2 --
 tests/testnouiprint.c          |  2 +-
 tests/testprint.c              |  1 -
 tests/testprintfileoperation.h |  2 +-
 tests/testtreesort.c           |  2 +-
 tests/textbuffertest.c         |  2 +-
 11 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6b3c6202..11c442e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-05-23  Michael Natterer  <mitch@gimp.org>
+
+	* perf/widgets.h
+	* tests/print-editor.c
+	* tests/prop-editor.h
+	* tests/testmountoperation.c
+	* tests/testmultidisplay.c
+	* tests/testnouiprint.c
+	* tests/testprint.c
+	* tests/testprintfileoperation.h
+	* tests/testtreesort.c
+	* tests/textbuffertest.c: include <gtk/gtk.h> instead of single
+	files. Remove some redundant includes.
+
 2008-05-22  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	* gtk/gtksockget.c: (gtk_socket_realize): Remove second call of
diff --git a/perf/widgets.h b/perf/widgets.h
index 349b13106..4c8c78770 100644
--- a/perf/widgets.h
+++ b/perf/widgets.h
@@ -1,4 +1,4 @@
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 GtkWidget *appwindow_new (void);
 
diff --git a/tests/print-editor.c b/tests/print-editor.c
index 9b47ce8d5..b476e013c 100644
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -1,7 +1,6 @@
 #include <math.h>
 #include <pango/pangocairo.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintoperation.h>
 
 static GtkWidget *main_window;
 static char *filename = NULL;
diff --git a/tests/prop-editor.h b/tests/prop-editor.h
index 1f86d9be1..377f81720 100644
--- a/tests/prop-editor.h
+++ b/tests/prop-editor.h
@@ -16,7 +16,8 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <gtk/gtkwidget.h>
+
+#include <gtk/gtk.h>
 
 #ifndef __PROP_EDITOR_H__
 #define __PROP_EDITOR_H__
diff --git a/tests/testmountoperation.c b/tests/testmountoperation.c
index 92edf3324..c6ba138c2 100644
--- a/tests/testmountoperation.c
+++ b/tests/testmountoperation.c
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkmountoperation.h>
 
 static gboolean ask_question = FALSE;
 static gboolean anonymous = FALSE;
diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c
index 3f4e3e450..3074b35db 100644
--- a/tests/testmultidisplay.c
+++ b/tests/testmultidisplay.c
@@ -20,8 +20,6 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkstock.h>
-#include <gdk/gdk.h>
 
 gchar *screen2_name = NULL;
 
diff --git a/tests/testnouiprint.c b/tests/testnouiprint.c
index 09a678f37..d63979b05 100644
--- a/tests/testnouiprint.c
+++ b/tests/testnouiprint.c
@@ -19,8 +19,8 @@
  */
 
 #include <config.h>
-#include "gtk/gtkprintoperation.h"
 #include <math.h>
+#include "gtk/gtk.h"
 
 static void
 draw_page (GtkPrintOperation *operation,
diff --git a/tests/testprint.c b/tests/testprint.c
index 1da7af97d..8eed10ef0 100644
--- a/tests/testprint.c
+++ b/tests/testprint.c
@@ -22,7 +22,6 @@
 #include <math.h>
 #include <pango/pangocairo.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintoperation.h>
 #include "testprintfileoperation.h"
 
 static void
diff --git a/tests/testprintfileoperation.h b/tests/testprintfileoperation.h
index 653abbf80..40472fdf9 100644
--- a/tests/testprintfileoperation.h
+++ b/tests/testprintfileoperation.h
@@ -1,7 +1,7 @@
 #ifndef __TEST_PRINT_FILE_OPERATION_H__
 #define __TEST_PRINT_FILE_OPERATION_H__
 
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 3b792c2d8..a58b1b40b 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #include <gtk/gtk.h>
 
-#include "../gtk/gtktreedatalist.h"
+#include "gtk/gtktreedatalist.h"
 
 
 typedef struct _ListSort ListSort;
diff --git a/tests/textbuffertest.c b/tests/textbuffertest.c
index f8a33a1eb..3fdbf9f40 100644
--- a/tests/textbuffertest.c
+++ b/tests/textbuffertest.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include "../gtk/gtktexttypes.h" /* Private header, for UNKNOWN_CHAR */
+#include "gtk/gtktexttypes.h" /* Private header, for UNKNOWN_CHAR */
 
 static void
 gtk_text_iter_spew (const GtkTextIter *iter, const gchar *desc)
-- 
2.43.2