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

14 files changed, 14 insertions, 18 deletions

diff --git a/widgets/table/e-cell-spin-button.h b/widgets/table/e-cell-spin-button.h
index 6bbd79bc99..df64d9007d 100644
--- a/widgets/table/e-cell-spin-button.h
+++ b/widgets/table/e-cell-spin-button.h
@@ -30,8 +30,7 @@
 #ifndef __E_CELL_SPIN_BUTTON_H__
 #define __E_CELL_SPIN_BUTTON_H__
 
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include <table/e-cell.h>
 
 #define E_CELL_SPIN_BUTTON_TYPE        (e_cell_spin_button_get_type ())
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index 93b958be0d..d92d02b7c8 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -36,7 +36,8 @@
 
 #ifndef _E_CELL_TEXT_H_
 #define _E_CELL_TEXT_H_
-#include <gtk/gtkmenu.h>
+
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <table/e-cell.h>
 
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index b92e493e19..65be53f816 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -25,7 +25,6 @@
 #ifndef _E_CELL_H_
 #define _E_CELL_H_
 
-#include <gdk/gdktypes.h>
 #include <gtk/gtk.h>
 #include <table/e-table-model.h>
 #include <table/e-table-tooltip.h>
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index ca81b5bb6d..47c730c925 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -30,7 +30,7 @@
 #include <table/e-table-without.h>
 #include <table/e-table-subset-variable.h>
 #include <table/e-table.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 32012e4494..e175a5d17f 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -24,7 +24,7 @@
 #ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__
 #define __E_TABLE_FIELD_CHOOSER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <table/e-table-field-chooser.h>
 #include <table/e-table-header.h>
 
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index f6dca643d7..928558b75e 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -25,7 +25,7 @@
 #define __E_TABLE_FIELD_CHOOSER_H__
 
 #include <glade/glade.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <table/e-table-header.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
index 1c7c0b48fd..239fc15d1e 100644
--- a/widgets/table/e-table-scrolled.h
+++ b/widgets/table/e-table-scrolled.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SCROLLED_H_
 #define _E_TABLE_SCROLLED_H_
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <table/e-table-model.h>
 #include <table/e-table.h>
 
diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h
index ecb3efa6e9..67fddac8a3 100644
--- a/widgets/table/e-table-search.h
+++ b/widgets/table/e-table-search.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SEARCH_H_
 #define _E_TABLE_SEARCH_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 60b7812413..075939a8a5 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SELECTION_MODEL_H_
 #define _E_TABLE_SELECTION_MODEL_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <misc/e-selection-model-array.h>
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index 57d6a4cfe2..7788509b7b 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_WITHOUT_H_
 #define _E_TABLE_WITHOUT_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <table/e-table-subset.h>
 
 #ifdef __cplusplus
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 7d6bb2a97e..5e7f3544bb 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -26,8 +26,7 @@
 #define _E_TABLE_H_
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h
index 9671061222..1e35828989 100644
--- a/widgets/table/e-tree-scrolled.h
+++ b/widgets/table/e-tree-scrolled.h
@@ -24,7 +24,7 @@
 #ifndef _E_TREE_SCROLLED_H_
 #define _E_TREE_SCROLLED_H_
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <table/e-tree-model.h>
 #include <table/e-tree.h>
 
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index 2920ac6a9e..ffac924ad3 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -24,8 +24,7 @@
 #ifndef _E_TREE_SELECTION_MODEL_H_
 #define _E_TREE_SELECTION_MODEL_H_
 
-#include <gdk/gdktypes.h>
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <e-util/e-sorter.h>
 #include <misc/e-selection-model.h>
 #include <table/e-tree-model.h>
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 03c67a0563..f497b4721f 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -24,8 +24,7 @@
 #ifndef _E_TREE_H_
 #define _E_TREE_H_
 
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <misc/e-printable.h>