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

12 files changed, 9 insertions, 20 deletions

diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index cbd6d23e06..8d099df961 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-#include <gtk/gtklabel.h>
 #include <glib/gi18n.h>
 
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index e353886d21..bc92350a52 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -24,9 +24,7 @@
 #ifndef __GAL_DEFINE_VIEWS_DIALOG_H__
 #define __GAL_DEFINE_VIEWS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #include <widgets/menus/gal-view-collection.h>
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
index d5a1e493ef..23d2248958 100644
--- a/widgets/menus/gal-view-collection.h
+++ b/widgets/menus/gal-view-collection.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_SET_H_
 #define _GAL_VIEW_SET_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <widgets/menus/gal-view-factory.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index 83d1259fca..0209a17995 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_ETABLE_H_
 #define _GAL_VIEW_ETABLE_H_
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <widgets/menus/gal-view.h>
 #include <table/e-table-state.h>
 #include <table/e-table-specification.h>
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
index 2535ef01b4..c85927969d 100644
--- a/widgets/menus/gal-view-factory-etable.h
+++ b/widgets/menus/gal-view-factory-etable.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_FACTORY_ETABLE_H_
 #define _GAL_VIEW_FACTORY_ETABLE_H_
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <widgets/menus/gal-view-factory.h>
 #include <table/e-table-specification.h>
 
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index 939917d488..739695bea5 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_FACTORY_H_
 #define _GAL_VIEW_FACTORY_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <widgets/menus/gal-view.h>
 
 #ifdef __cplusplus
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 7fcaf6699d..9e207c9104 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h
index f3d30ad7d0..a96d5bc9ed 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.h
+++ b/widgets/menus/gal-view-instance-save-as-dialog.h
@@ -24,10 +24,8 @@
 #ifndef __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
 #define __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
 #include <widgets/menus/gal-view-collection.h>
 #include <widgets/menus/gal-view-instance.h>
 
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index f1ebf1cdfa..1612cb91e6 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_INSTANCE_H_
 #define _GAL_VIEW_INSTANCE_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <widgets/menus/gal-view-collection.h>
 #include <misc/e-popup-menu.h>
 
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 5fab621174..dfc3e87159 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include "table/e-table-scrolled.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
index 3d898d45cd..a8b493799c 100644
--- a/widgets/menus/gal-view-new-dialog.h
+++ b/widgets/menus/gal-view-new-dialog.h
@@ -24,8 +24,7 @@
 #ifndef __GAL_VIEW_NEW_DIALOG_H__
 #define __GAL_VIEW_NEW_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gal-view-collection.h>
 
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index bad347e824..ae682c7395 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_H_
 #define _GAL_VIEW_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 
 #ifdef __cplusplus