aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/importer/evolution-importer-client.h2
-rw-r--r--shell/importer/intelligent.c20
-rw-r--r--shell/test/evolution-test-component.c2
4 files changed, 10 insertions, 21 deletions
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"