Only include the toplevel GTK+ header.

2008-10-30  Matthew Barnes  <mbarnes@redhat.com>

	* addressbook/gui/contact-editor/test-editor.c:
	* addressbook/gui/widgets/e-minicard-label.c:
	* addressbook/gui/widgets/e-minicard-view-widget.c:
	* addressbook/gui/widgets/test-reflow.c:
	* calendar/gui/control-factory.c:
	* calendar/gui/e-calendar-table.c:
	* calendar/gui/e-week-view-event-item.c:
	* calendar/gui/weekday-picker.c:
	* e-util/e-icon-factory.c:
	* shell/importer/evolution-importer-client.h:
	* shell/importer/intelligent.c:
	* shell/test/evolution-test-component.c:
	* widgets/menus/gal-view-menus.c:
	* widgets/misc/e-activity-handler.c:
	* widgets/table/e-table-config-field.h:
	Only include the toplevel GTK+ header.


svn path=/trunk/; revision=36699

20 files changed, 50 insertions, 34 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 46f6de9bd2..f061e55515 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/contact-editor/test-editor.c:
+	* gui/widgets/e-minicard-label.c:
+	* gui/widgets/e-minicard-view-widget.c:
+	* gui/widgets/test-reflow.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #511918
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 7a7e644238..61c6de7174 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <glade/glade.h>
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 7cc835cae4..85f2c5fd28 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -25,7 +25,7 @@
 #include "e-minicard-label.h"
 #include "eab-marshal.h"
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 2796bfe433..d416da2015 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <misc/e-canvas-background.h>
 #include <misc/e-canvas.h>
 #include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index 8853e7f748..f0faf7899c 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -50,8 +50,7 @@
 
 #include "config.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-init.h>
 #include <misc/e-canvas.h>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 343a76a9e0..3819751320 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/control-factory.c:
+	* gui/e-calendar-table.c:
+	* gui/e-week-view-event-item.c:
+	* gui/weekday-picker.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-20  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #555958 (patch by Anis Elleuch)
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 63014b2c4f..288558dc14 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-generic-factory.h>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index c72dfe110a..25442abd57 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gnome.h>
-#include <gtk/gtktooltip.h>
+#include <gtk/gtk.h>
 #include <misc/e-gui-utils.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 248e618bda..dcb3dd96f5 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -33,7 +33,7 @@
 #include "e-util/e-categories-config.h"
 #include "e-week-view-event-item.h"
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include "e-calendar-view.h"
 #include "comp-util.h"
 
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 3140d69df5..53fe6dcce6 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index d0e948fd25..3cc045e114 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-icon-factory.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-29  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index d26717e9e0..7e9cf4cad7 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -34,7 +34,7 @@
 #include <libgnomeui/gnome-thumbnail.h>
 #endif
 
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include "e-icon-factory.h"
 #include "e-util-private.h"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 4ea93c997e..4ba417f5d8 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* importer/evolution-importer-client.h:
+	* importer/intelligent.c:
+	* test/evolution-test-component.c:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Kandepu Prasad  <kaprasad@novell.com>
 
 	** Fix for bug #311479
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 043a639c5d..35cde858d6 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -24,7 +24,7 @@
 #define EVOLUTION_IMPORTER_CLIENT_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <importer/evolution-importer.h>
 #include <importer/evolution-importer-listener.h>
 
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index a9a8fed024..c7cb6b3b0c 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -26,25 +26,7 @@
 
 #include "intelligent.h"
 
-#include <glib.h>
-
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-config.h>
 /*#include <libgnome/gnome-util.h>*/
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 0226ed74db..16aed882d0 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -30,7 +30,7 @@
 #include <bonobo/bonobo-shlib-factory.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include "e-task-bar.h"
 #include "evolution-test-component.h"
 
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index ef2cb7e355..58dfe1eb7e 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-30  Matthew Barnes  <mbarnes@redhat.com>
+
+	* widgets/menus/gal-view-menus.c:
+	* widgets/misc/e-activity-handler.c:
+	* widgets/table/e-table-config-field.h:
+	Only include the toplevel GTK+ header.
+
 2008-10-17  Sankar P  <psankar@novell.com>
 
 License Changes
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index ba2a203390..8640d5fb6b 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -30,7 +30,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 #include <libgnomeui/gnome-dialog.h>
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 98c844ff3f..fe4949148f 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -26,7 +26,7 @@
 
 #include "e-activity-handler.h"
 
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <glib/gi18n.h>
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
index 3e21147ef5..382ff941b1 100644
--- a/widgets/table/e-table-config-field.h
+++ b/widgets/table/e-table-config-field.h
@@ -23,7 +23,7 @@
 #ifndef _E_TABLE_CONFIG_FIELD_H_
 #define _E_TABLE_CONFIG_FIELD_H_
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-specification.h>