** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and

2008-06-06  Matthew Barnes  <mbarnes@redhat.com>

	** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
	   GTK_DISABLE_SINGLE_INCLUDES defined.  (#536637)


svn path=/trunk/; revision=35606

15 files changed, 13 insertions, 62 deletions

diff --git a/shell/e-history.h b/shell/e-history.h
index 89bfe674a9..91b7bc3724 100644
--- a/shell/e-history.h
+++ b/shell/e-history.h
@@ -23,7 +23,7 @@
 #ifndef _E_HISTORY_H_
 #define _E_HISTORY_H_
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 5f12035239..4c75cc0d80 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -25,14 +25,7 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
 #include <glib/gi18n.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "e-shell-constants.h"
 #include "e-shell-marshal.h"
diff --git a/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h
index 54d2a92b05..cee4842741 100644
--- a/shell/e-shell-folder-title-bar.h
+++ b/shell/e-shell-folder-title-bar.h
@@ -23,8 +23,7 @@
 #ifndef __E_SHELL_FOLDER_TITLE_BAR_H__
 #define __E_SHELL_FOLDER_TITLE_BAR_H__
 
-#include <gtk/gtkhbox.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 48c480227b..32648baf1a 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -27,8 +27,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <glib.h>
-
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <glade/glade.h>
@@ -39,8 +38,6 @@
 #include <libgnomeui/gnome-druid-page-edge.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 
-#include <gtk/gtkfilechooserbutton.h>
-
 #include "misc/e-gui-utils.h"
 
 #include "e-util/e-dialog-utils.h"
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index a6de85d45c..d4a1d157ee 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -37,6 +37,7 @@
 
 #include <bonobo-activation/bonobo-activation.h>
 
+#include <stdlib.h>
 #include <string.h>
 
 struct _EShellSettingsDialogPrivate {
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 532ae0dda6..f7ff820598 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -26,9 +26,7 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "e-shell-view.h"
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 887ced0c87..8e652c6480 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -38,15 +38,7 @@
 #include "es-menu.h"
 #include "es-event.h"
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-object.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 6223cc0599..86e0cd00dd 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -23,14 +23,12 @@
 #include <config.h>
 
 #include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkprivate.h>
 #include <gdk/gdkx.h>
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 9bf9b0ae33..20c5e59047 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -28,12 +28,6 @@
 
 #include "e-shell-marshal.h"
 
-#include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
-
 #include <gconf/gconf-client.h>
 #include <libgnome/gnome-gconf.h>
 
diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h
index 15280580a9..4ab74024b3 100644
--- a/shell/e-sidebar.h
+++ b/shell/e-sidebar.h
@@ -23,7 +23,7 @@
 #ifndef _E_SIDEBAR_H_
 #define _E_SIDEBAR_H_
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 #define E_TYPE_SIDEBAR			(e_sidebar_get_type ())
 #define E_SIDEBAR(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SIDEBAR, ESidebar))
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index bd72b57f59..e74220ad95 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -36,16 +36,9 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-control.h>
 
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktooltips.h>
-
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c
index 3e38a43456..69e3bef56d 100644
--- a/shell/evolution-config-control.c
+++ b/shell/evolution-config-control.c
@@ -30,8 +30,6 @@
 
 #include <e-util/e-util.h>
 
-#include <gtk/gtksignal.h>
-
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-event-source.h>
 
diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h
index b751ae831c..51c5680cd9 100644
--- a/shell/evolution-config-control.h
+++ b/shell/evolution-config-control.h
@@ -26,7 +26,7 @@
 #include "Evolution.h"
 
 #include <bonobo/bonobo-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifdef cplusplus
 extern "C" {
diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h
index d0ddb60263..4bd7d582bd 100644
--- a/shell/evolution-shell-component-utils.h
+++ b/shell/evolution-shell-component-utils.h
@@ -22,7 +22,7 @@
 #define __EVOLUTION_SHELL_COMPONENT_UTILS_H__
 
 #include <bonobo/bonobo-ui-component.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/shell/main.c b/shell/main.c
index 705f57d369..3bf48be7ae 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
 #ifdef G_OS_WIN32
@@ -50,18 +50,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
-
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-sound.h>