** 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

23 files changed, 19 insertions, 115 deletions

diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 9907f557e3..0b75f9b634 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -9,9 +9,8 @@
  */
 
 #include <string.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserverui/e-categories-dialog.h>
 #include "e-categories-config.h"
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index ed6b5639ae..0188be90e1 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -11,9 +11,7 @@
 #ifndef __E_CATEGORIES_CONFIG_H__
 #define __E_CATEGORIES_CONFIG_H__
 
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 5918600000..22f6ac5f0b 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -27,15 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 8207e18181..ce43e1c8cf 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -29,22 +29,12 @@
 #include "e-dialog-utils.h"
 
 #include <unistd.h>
-#include <glib.h>
 #include <glib/gstdio.h>
 
-#include <gdkconfig.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkplug.h>
-#include <gtk/gtkversion.h>
-
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index e3971b8a7c..34a8380d81 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -23,8 +23,7 @@
 #ifndef E_DIALOG_UTILS_H
 #define E_DIALOG_UTILS_H
 
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
 
 void  e_notice                       (gpointer         parent,
 				      GtkMessageType   type,
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 20f7db5ce5..6bf3434046 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -25,13 +25,7 @@
 #include <math.h>
 #include <string.h>
 #include <time.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-dateedit.h>
 
 #include "e-dialog-widgets.h"
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 1fee2f4164..4ee905fcee 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -27,16 +27,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-url.h>
 
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 5ac51d10ee..b3d2cb547d 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -27,16 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #include "e-event.h"
 
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index 4da3e6dcfe..7e20577d4c 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -20,14 +20,6 @@
 #include "e-gui-utils.h"
 #include <e-util/e-icon-factory.h>
 
-#include <glib.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkicontheme.h>
-
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-icon-lookup.h>
 
diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h
index 678ab1bcd8..740c77e95e 100644
--- a/e-util/e-gui-utils.h
+++ b/e-util/e-gui-utils.h
@@ -1,7 +1,7 @@
 #ifndef E_GUI_UTILS_H
 #define E_GUI_UTILS_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 GdkPixbuf *e_icon_for_mime_type          (const char *mime_type, int size);
 GtkWidget *e_create_image_widget         (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 556c52ebb5..98d788a673 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -30,8 +30,6 @@
 
 #include <pthread.h>
 
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkimage.h>
 #ifdef HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H
 #include <libgnomeui/gnome-thumbnail.h>
 #endif
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index 92ecac8ac6..d8271292a7 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -23,8 +23,7 @@
 #ifndef _E_ICON_FACTORY_H_
 #define _E_ICON_FACTORY_H_
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 enum {
 	E_ICON_SIZE_MENU,
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 92a54f59ac..d52c225112 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -27,15 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 85dbcd24f1..f315c25836 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -2,10 +2,8 @@
 #ifndef _E_PLUGIN_H
 #define _E_PLUGIN_H
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
-#include <gtk/gtkwidget.h>
 
 /* ********************************************************************** */
 
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index b7d904a6eb..60f280aabe 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -27,17 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #include "e-popup.h"
 
diff --git a/e-util/e-request.c b/e-util/e-request.c
index beb52686e9..e7199254e0 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -26,12 +26,6 @@
 
 #include "e-request.h"
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-
 
 /**
  * e_request_string:
diff --git a/e-util/e-request.h b/e-util/e-request.h
index 8a446a15d5..f3471fd2b6 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.h
@@ -23,7 +23,7 @@
 #ifndef E_REQUEST_H
 #define E_REQUEST_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 char *e_request_string  (GtkWindow  *parent,
 			 const char *title,
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index ba68cae113..6593b9a978 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -24,12 +24,10 @@
 #ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__
 #define __E_TEXT_EVENT_PROCESSOR_TYPES_H__
 
-#include <glib/gmacros.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
-#include <gdk/gdkevents.h>
-
 typedef union _ETextEventProcessorEvent ETextEventProcessorEvent;
 
 typedef enum {
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index f3b408fb3d..62c2e8f866 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -24,8 +24,7 @@
 #ifndef __E_TEXT_EVENT_PROCESSOR_H__
 #define __E_TEXT_EVENT_PROCESSOR_H__
 
-#include <glib.h>
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <e-util/e-text-event-processor-types.h>
 
 #ifdef __cplusplus
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index 5c859be975..9bbc507c6f 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -19,7 +19,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include <stdio.h>
@@ -27,14 +27,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-
 #include <camel/camel-utf8.h>
 
 #include "e-util-labels.h"
diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h
index 97a49f4db3..0330abdc15 100644
--- a/e-util/e-util-labels.h
+++ b/e-util/e-util-labels.h
@@ -22,8 +22,7 @@
 #ifndef _E_UTIL_LABELS_H
 #define _E_UTIL_LABELS_H
 
-#include <glib.h>
-#include <gdk/gdkcolor.h>
+#include <gtk/gtk.h>
 
 struct _GtkWindow;
 struct _GConfClient;
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 49754cfe96..5135eb1d30 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -21,8 +21,8 @@
 
 #include <config.h>
 
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkmessagedialog.h>
 #include <string.h>
 
 #include "gconf-bridge.h"
diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h
index aa7bfaefb8..ba67f4f8e6 100644
--- a/e-util/gconf-bridge.h
+++ b/e-util/gconf-bridge.h
@@ -23,8 +23,7 @@
 #define __GCONF_BRIDGE_H__
 
 #include <gconf/gconf-client.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS