evolution-exchange r1678 - in trunk: . storage

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Jun  6 15:30:24 2008
New Revision: 1678
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1678&view=rev

Log:
2008-06-06  Matthew Barnes  <mbarnes redhat com>

	** Allow evolution-exchange to build with G_DISABLE_SINGLE_INCLUDES
	   and GTK_DISABLE_SINGLE_INCLUDES defined.  (#536638)



Modified:
   trunk/ChangeLog
   trunk/storage/exchange-autoconfig-wizard.c
   trunk/storage/exchange-change-password.c
   trunk/storage/exchange-migrate.c
   trunk/storage/migr-test.c
   trunk/storage/ximian-connector-setup.c

Modified: trunk/storage/exchange-autoconfig-wizard.c
==============================================================================
--- trunk/storage/exchange-autoconfig-wizard.c	(original)
+++ trunk/storage/exchange-autoconfig-wizard.c	Fri Jun  6 15:30:24 2008
@@ -36,8 +36,7 @@
 
 #include <gconf/gconf-client.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklinkbutton.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 

Modified: trunk/storage/exchange-change-password.c
==============================================================================
--- trunk/storage/exchange-change-password.c	(original)
+++ trunk/storage/exchange-change-password.c	Fri Jun  6 15:30:24 2008
@@ -27,10 +27,8 @@
 #include "exchange-account.h"
 #include "e2k-utils.h"
 
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
 
 #include "exchange-storage.h"
 

Modified: trunk/storage/exchange-migrate.c
==============================================================================
--- trunk/storage/exchange-migrate.c	(original)
+++ trunk/storage/exchange-migrate.c	Fri Jun  6 15:30:24 2008
@@ -26,13 +26,7 @@
 #include <utime.h>
 #include <string.h>
 
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkprogressbar.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-folder-map.h>
 

Modified: trunk/storage/migr-test.c
==============================================================================
--- trunk/storage/migr-test.c	(original)
+++ trunk/storage/migr-test.c	Fri Jun  6 15:30:24 2008
@@ -24,9 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkmain.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnome/libgnome.h>

Modified: trunk/storage/ximian-connector-setup.c
==============================================================================
--- trunk/storage/ximian-connector-setup.c	(original)
+++ trunk/storage/ximian-connector-setup.c	Fri Jun  6 15:30:24 2008
@@ -21,7 +21,6 @@
 #include <config.h>
 #endif
 
-#include <glib/gtypes.h>
 #include <libgnomeui/gnome-ui-init.h>
 
 #include <e-util/e-dialog-utils.h>