GNOME.org
 

evolution-data-server r8948 - in trunk: . addressbook/backends/groupwise addressbook/backends/ldap calendar/libecal calendar/libedata-cal camel libedataserver libedataserverui servers/exchange/lib servers/exchange/storage servers/exchange/xntlm servers/groupwise

Author: mbarnes
Date: Fri Jun  6 13:56:33 2008
New Revision: 8948
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8948&view=rev

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

	** Allow e-d-s to build with G_DISABLE_SINGLE_INCLUDES
	   and GTK_DISABLE_SINGLE_INCLUDES defined. (#536636)



Modified:
   trunk/ChangeLog
   trunk/addressbook/backends/groupwise/create-account.c
   trunk/addressbook/backends/ldap/e-book-backend-ldap.c
   trunk/calendar/libecal/e-cal-component.h
   trunk/calendar/libedata-cal/e-data-cal-common.h
   trunk/camel/camel-tcp-stream.h
   trunk/libedataserver/e-categories.h
   trunk/libedataserver/e-data-server-util.h
   trunk/libedataserver/e-proxy.c
   trunk/libedataserverui/e-book-auth-util.c
   trunk/libedataserverui/e-categories-dialog.c
   trunk/libedataserverui/e-categories-dialog.h
   trunk/libedataserverui/e-cell-renderer-color.h
   trunk/libedataserverui/e-contact-store.c
   trunk/libedataserverui/e-contact-store.h
   trunk/libedataserverui/e-destination-store.c
   trunk/libedataserverui/e-destination-store.h
   trunk/libedataserverui/e-name-selector-dialog.c
   trunk/libedataserverui/e-name-selector-dialog.h
   trunk/libedataserverui/e-name-selector-entry.c
   trunk/libedataserverui/e-name-selector-entry.h
   trunk/libedataserverui/e-name-selector-list.c
   trunk/libedataserverui/e-name-selector-list.h
   trunk/libedataserverui/e-name-selector.c
   trunk/libedataserverui/e-passwords.h
   trunk/libedataserverui/e-source-option-menu.c
   trunk/libedataserverui/e-source-option-menu.h
   trunk/libedataserverui/e-source-selector-dialog.c
   trunk/libedataserverui/e-source-selector-dialog.h
   trunk/libedataserverui/e-source-selector.c
   trunk/libedataserverui/e-source-selector.h
   trunk/libedataserverui/e-tree-model-generator.c
   trunk/libedataserverui/e-tree-model-generator.h
   trunk/libedataserverui/test-source-combo-box.c
   trunk/libedataserverui/test-source-selector.c
   trunk/servers/exchange/lib/e2k-validate.h
   trunk/servers/exchange/storage/e-folder.h
   trunk/servers/exchange/storage/exchange-account.c
   trunk/servers/exchange/storage/exchange-account.h
   trunk/servers/exchange/storage/exchange-folder-size.c
   trunk/servers/exchange/storage/exchange-folder-size.h
   trunk/servers/exchange/storage/exchange-oof.h
   trunk/servers/exchange/xntlm/xntlm-des.h
   trunk/servers/exchange/xntlm/xntlm-md4.c
   trunk/servers/groupwise/create-account.c
   trunk/servers/groupwise/soap-test.c

Modified: trunk/addressbook/backends/groupwise/create-account.c
==============================================================================
--- trunk/addressbook/backends/groupwise/create-account.c	(original)
+++ trunk/addressbook/backends/groupwise/create-account.c	Fri Jun  6 13:56:33 2008
@@ -1,7 +1,7 @@
 
 #include <config.h>
 #include <gconf/gconf-client.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include "libedataserver/e-source-list.h"
 
 static GConfClient *conf_client;

Modified: trunk/addressbook/backends/ldap/e-book-backend-ldap.c
==============================================================================
--- trunk/addressbook/backends/ldap/e-book-backend-ldap.c	(original)
+++ trunk/addressbook/backends/ldap/e-book-backend-ldap.c	Fri Jun  6 13:56:33 2008
@@ -2104,14 +2104,13 @@
 	msg_type = ldap_msgtype (res);
 	if (msg_type == LDAP_RES_SEARCH_ENTRY) {
 		LDAPMessage *e;
+		EContact *contact;
+		char *vcard;
 
 		g_static_rec_mutex_lock (&eds_ldap_handler_lock);
 		e = ldap_first_entry (bl->priv->ldap, res);
 		g_static_rec_mutex_unlock (&eds_ldap_handler_lock);
 
-		EContact *contact;
-		char *vcard;
-
 		if (!e) {
 			g_warning ("uh, this shouldn't happen");
 			e_data_book_respond_get_contact (op->book,

Modified: trunk/calendar/libecal/e-cal-component.h
==============================================================================
--- trunk/calendar/libecal/e-cal-component.h	(original)
+++ trunk/calendar/libecal/e-cal-component.h	Fri Jun  6 13:56:33 2008
@@ -22,7 +22,6 @@
 #ifndef E_CAL_COMPONENT_H
 #define E_CAL_COMPONENT_H
 
-#include <glib/gmacros.h>
 #include <time.h>
 #include <glib-object.h>
 #include <libical/ical.h>

Modified: trunk/calendar/libedata-cal/e-data-cal-common.h
==============================================================================
--- trunk/calendar/libedata-cal/e-data-cal-common.h	(original)
+++ trunk/calendar/libedata-cal/e-data-cal-common.h	Fri Jun  6 13:56:33 2008
@@ -22,7 +22,7 @@
 #ifndef CAL_COMMON_H
 #define CAL_COMMON_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/camel/camel-tcp-stream.h
==============================================================================
--- trunk/camel/camel-tcp-stream.h	(original)
+++ trunk/camel/camel-tcp-stream.h	Fri Jun  6 13:56:33 2008
@@ -24,7 +24,7 @@
 #ifndef CAMEL_TCP_STREAM_H
 #define CAMEL_TCP_STREAM_H
 
-#include <glibconfig.h>
+#include <glib.h>
 
 #ifndef G_OS_WIN32
 #include <sys/types.h>

Modified: trunk/libedataserver/e-categories.h
==============================================================================
--- trunk/libedataserver/e-categories.h	(original)
+++ trunk/libedataserver/e-categories.h	Fri Jun  6 13:56:33 2008
@@ -21,8 +21,6 @@
 #define __E_CATEGORIES__
 
 #include <glib-object.h>
-#include <glib/glist.h>
-#include <glib/gmacros.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libedataserver/e-data-server-util.h
==============================================================================
--- trunk/libedataserver/e-data-server-util.h	(original)
+++ trunk/libedataserver/e-data-server-util.h	Fri Jun  6 13:56:33 2008
@@ -24,9 +24,7 @@
 
 #include <pthread.h>
 #include <sys/types.h>
-#include <glib/gmacros.h>
-#include <glib/gtypes.h>
-#include <glib/gunicode.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libedataserver/e-proxy.c
==============================================================================
--- trunk/libedataserver/e-proxy.c	(original)
+++ trunk/libedataserver/e-proxy.c	Fri Jun  6 13:56:33 2008
@@ -162,11 +162,12 @@
 e_proxy_dispose (GObject *object)
 {
 	EProxy *proxy = (EProxy *)object;
+	EProxyPrivate *priv;
 	
 	if (!E_IS_PROXY (proxy))
 		return;
 
-	EProxyPrivate *priv = proxy->priv;
+	priv = proxy->priv;
 
 	if (priv) {
 		GConfClient* client = NULL;

Modified: trunk/libedataserverui/e-book-auth-util.c
==============================================================================
--- trunk/libedataserverui/e-book-auth-util.c	(original)
+++ trunk/libedataserverui/e-book-auth-util.c	Fri Jun  6 13:56:33 2008
@@ -25,7 +25,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libedataserverui/e-passwords.h>

Modified: trunk/libedataserverui/e-categories-dialog.c
==============================================================================
--- trunk/libedataserverui/e-categories-dialog.c	(original)
+++ trunk/libedataserverui/e-categories-dialog.c	Fri Jun  6 13:56:33 2008
@@ -23,20 +23,7 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 #include "libedataserver/e-categories.h"
 #include "libedataserver/libedataserver-private.h"

Modified: trunk/libedataserverui/e-categories-dialog.h
==============================================================================
--- trunk/libedataserverui/e-categories-dialog.h	(original)
+++ trunk/libedataserverui/e-categories-dialog.h	Fri Jun  6 13:56:33 2008
@@ -20,7 +20,7 @@
 #ifndef __E_CATEGORIES_DIALOG__
 #define __E_CATEGORIES_DIALOG__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libedataserverui/e-cell-renderer-color.h
==============================================================================
--- trunk/libedataserverui/e-cell-renderer-color.h	(original)
+++ trunk/libedataserverui/e-cell-renderer-color.h	Fri Jun  6 13:56:33 2008
@@ -23,7 +23,7 @@
 
 
 #include <glib.h>
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #define E_TYPE_CELL_RENDERER_COLOR \
 	(e_cell_renderer_color_get_type ())

Modified: trunk/libedataserverui/e-contact-store.c
==============================================================================
--- trunk/libedataserverui/e-contact-store.c	(original)
+++ trunk/libedataserverui/e-contact-store.c	Fri Jun  6 13:56:33 2008
@@ -25,9 +25,6 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
 #include <glib/gi18n-lib.h>
 #include "e-contact-store.h"
 

Modified: trunk/libedataserverui/e-contact-store.h
==============================================================================
--- trunk/libedataserverui/e-contact-store.h	(original)
+++ trunk/libedataserverui/e-contact-store.h	Fri Jun  6 13:56:33 2008
@@ -23,7 +23,7 @@
 #ifndef E_CONTACT_STORE_H
 #define E_CONTACT_STORE_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libebook/e-contact.h>
 #include <libebook/e-book.h>
 #include <libebook/e-book-query.h>

Modified: trunk/libedataserverui/e-destination-store.c
==============================================================================
--- trunk/libedataserverui/e-destination-store.c	(original)
+++ trunk/libedataserverui/e-destination-store.c	Fri Jun  6 13:56:33 2008
@@ -25,9 +25,6 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktreednd.h>
 #include <glib/gi18n-lib.h>
 #include "e-destination-store.h"
 

Modified: trunk/libedataserverui/e-destination-store.h
==============================================================================
--- trunk/libedataserverui/e-destination-store.h	(original)
+++ trunk/libedataserverui/e-destination-store.h	Fri Jun  6 13:56:33 2008
@@ -23,7 +23,7 @@
 #ifndef E_DESTINATION_STORE_H
 #define E_DESTINATION_STORE_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libebook/e-destination.h>
 
 G_BEGIN_DECLS

Modified: trunk/libedataserverui/e-name-selector-dialog.c
==============================================================================
--- trunk/libedataserverui/e-name-selector-dialog.c	(original)
+++ trunk/libedataserverui/e-name-selector-dialog.c	Fri Jun  6 13:56:33 2008
@@ -23,16 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <glib/gstrfuncs.h>
 #include <glib/gi18n-lib.h>
 #include <libedataserverui/e-source-combo-box.h>
 #include <libedataserverui/e-destination-store.h>

Modified: trunk/libedataserverui/e-name-selector-dialog.h
==============================================================================
--- trunk/libedataserverui/e-name-selector-dialog.h	(original)
+++ trunk/libedataserverui/e-name-selector-dialog.h	Fri Jun  6 13:56:33 2008
@@ -24,13 +24,7 @@
 #ifndef E_NAME_SELECTOR_DIALOG_H
 #define E_NAME_SELECTOR_DIALOG_H
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <libebook/e-book.h>
 #include <libedataserverui/e-contact-store.h>

Modified: trunk/libedataserverui/e-name-selector-entry.c
==============================================================================
--- trunk/libedataserverui/e-name-selector-entry.c	(original)
+++ trunk/libedataserverui/e-name-selector-entry.c	Fri Jun  6 13:56:33 2008
@@ -23,15 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkclipboard.h>
 
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>

Modified: trunk/libedataserverui/e-name-selector-entry.h
==============================================================================
--- trunk/libedataserverui/e-name-selector-entry.h	(original)
+++ trunk/libedataserverui/e-name-selector-entry.h	Fri Jun  6 13:56:33 2008
@@ -24,7 +24,7 @@
 #ifndef E_NAME_SELECTOR_ENTRY_H
 #define E_NAME_SELECTOR_ENTRY_H
 
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include <libebook/e-contact.h>
 #include <libedataserverui/e-contact-store.h>
 #include <libedataserverui/e-destination-store.h>

Modified: trunk/libedataserverui/e-name-selector-list.c
==============================================================================
--- trunk/libedataserverui/e-name-selector-list.c	(original)
+++ trunk/libedataserverui/e-name-selector-list.c	Fri Jun  6 13:56:33 2008
@@ -25,19 +25,6 @@
 #include <config.h>
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkvbox.h>
 #include <glib/gi18n-lib.h>
 
 #include <libebook/e-book.h>

Modified: trunk/libedataserverui/e-name-selector-list.h
==============================================================================
--- trunk/libedataserverui/e-name-selector-list.h	(original)
+++ trunk/libedataserverui/e-name-selector-list.h	Fri Jun  6 13:56:33 2008
@@ -24,8 +24,7 @@
 #ifndef E_NAME_SELECTOR_LIST_H
 #define E_NAME_SELECTOR_LIST_H
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libebook/e-contact.h>
 #include <libedataserverui/e-contact-store.h>
 #include <libedataserverui/e-destination-store.h>

Modified: trunk/libedataserverui/e-name-selector.c
==============================================================================
--- trunk/libedataserverui/e-name-selector.c	(original)
+++ trunk/libedataserverui/e-name-selector.c	Fri Jun  6 13:56:33 2008
@@ -26,10 +26,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>

Modified: trunk/libedataserverui/e-passwords.h
==============================================================================
--- trunk/libedataserverui/e-passwords.h	(original)
+++ trunk/libedataserverui/e-passwords.h	Fri Jun  6 13:56:33 2008
@@ -24,7 +24,7 @@
 #define _E_PASSWORD_H_
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libedataserverui/e-source-option-menu.c
==============================================================================
--- trunk/libedataserverui/e-source-option-menu.c	(original)
+++ trunk/libedataserverui/e-source-option-menu.c	Fri Jun  6 13:56:33 2008
@@ -24,10 +24,6 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-
 #include "e-source-option-menu.h"
 
 /* We set data on each menu item specifying the corresponding ESource using this key.  */

Modified: trunk/libedataserverui/e-source-option-menu.h
==============================================================================
--- trunk/libedataserverui/e-source-option-menu.h	(original)
+++ trunk/libedataserverui/e-source-option-menu.h	Fri Jun  6 13:56:33 2008
@@ -27,7 +27,7 @@
 
 #include "libedataserver/e-source-list.h"
 
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 
 #define E_TYPE_SOURCE_OPTION_MENU			(e_source_option_menu_get_type ())
 #define E_SOURCE_OPTION_MENU(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SOURCE_OPTION_MENU, ESourceOptionMenu))

Modified: trunk/libedataserverui/e-source-selector-dialog.c
==============================================================================
--- trunk/libedataserverui/e-source-selector-dialog.c	(original)
+++ trunk/libedataserverui/e-source-selector-dialog.c	Fri Jun  6 13:56:33 2008
@@ -27,12 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <glib-object.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
 #include "e-source-selector.h"
 #include "e-source-selector-dialog.h"
 

Modified: trunk/libedataserverui/e-source-selector-dialog.h
==============================================================================
--- trunk/libedataserverui/e-source-selector-dialog.h	(original)
+++ trunk/libedataserverui/e-source-selector-dialog.h	Fri Jun  6 13:56:33 2008
@@ -24,7 +24,7 @@
 #ifndef _E_SOURCE_SELECTOR_DIALOG_H_
 #define _E_SOURCE_SELECTOR_DIALOG_H_
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "libedataserver/e-source-list.h"
 
 G_BEGIN_DECLS

Modified: trunk/libedataserverui/e-source-selector.c
==============================================================================
--- trunk/libedataserverui/e-source-selector.c	(original)
+++ trunk/libedataserverui/e-source-selector.c	Fri Jun  6 13:56:33 2008
@@ -26,12 +26,6 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
 
 #include "e-data-server-ui-marshal.h"
 #include "e-source-selector.h"

Modified: trunk/libedataserverui/e-source-selector.h
==============================================================================
--- trunk/libedataserverui/e-source-selector.h	(original)
+++ trunk/libedataserverui/e-source-selector.h	Fri Jun  6 13:56:33 2008
@@ -24,8 +24,7 @@
 #ifndef _E_SOURCE_SELECTOR_H_
 #define _E_SOURCE_SELECTOR_H_
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "libedataserver/e-source-list.h"
 
 G_BEGIN_DECLS

Modified: trunk/libedataserverui/e-tree-model-generator.c
==============================================================================
--- trunk/libedataserverui/e-tree-model-generator.c	(original)
+++ trunk/libedataserverui/e-tree-model-generator.c	Fri Jun  6 13:56:33 2008
@@ -26,8 +26,6 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtksignal.h>
 #include "e-tree-model-generator.h"
 
 #define ETMG_DEBUG(x)

Modified: trunk/libedataserverui/e-tree-model-generator.h
==============================================================================
--- trunk/libedataserverui/e-tree-model-generator.h	(original)
+++ trunk/libedataserverui/e-tree-model-generator.h	Fri Jun  6 13:56:33 2008
@@ -23,7 +23,7 @@
 #ifndef E_TREE_MODEL_GENERATOR_H
 #define E_TREE_MODEL_GENERATOR_H
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libedataserverui/test-source-combo-box.c
==============================================================================
--- trunk/libedataserverui/test-source-combo-box.c	(original)
+++ trunk/libedataserverui/test-source-combo-box.c	Fri Jun  6 13:56:33 2008
@@ -26,8 +26,7 @@
 
 #include "e-source-combo-box.h"
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 static void
 source_changed_cb (ESourceComboBox *combo_box)

Modified: trunk/libedataserverui/test-source-selector.c
==============================================================================
--- trunk/libedataserverui/test-source-selector.c	(original)
+++ trunk/libedataserverui/test-source-selector.c	Fri Jun  6 13:56:33 2008
@@ -27,11 +27,7 @@
 
 #include "e-source-selector.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 static void
 dump_selection (ESourceSelector *selector)

Modified: trunk/servers/exchange/lib/e2k-validate.h
==============================================================================
--- trunk/servers/exchange/lib/e2k-validate.h	(original)
+++ trunk/servers/exchange/lib/e2k-validate.h	Fri Jun  6 13:56:33 2008
@@ -4,7 +4,7 @@
 #ifndef __E2K_VALIDATE_H_
 #define __E2K_VALIDATE_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/servers/exchange/storage/e-folder.h
==============================================================================
--- trunk/servers/exchange/storage/e-folder.h	(original)
+++ trunk/servers/exchange/storage/e-folder.h	Fri Jun  6 13:56:33 2008
@@ -24,7 +24,7 @@
 #define _E_FOLDER_H_
 
 #include <glib-object.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/servers/exchange/storage/exchange-account.c
==============================================================================
--- trunk/servers/exchange/storage/exchange-account.c	(original)
+++ trunk/servers/exchange/storage/exchange-account.c	Fri Jun  6 13:56:33 2008
@@ -46,8 +46,7 @@
 #include <libgnome/gnome-util.h>
 
 #include <glade/glade-xml.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/servers/exchange/storage/exchange-account.h
==============================================================================
--- trunk/servers/exchange/storage/exchange-account.h	(original)
+++ trunk/servers/exchange/storage/exchange-account.h	Fri Jun  6 13:56:33 2008
@@ -12,7 +12,7 @@
 #include "e2k-security-descriptor.h"
 #include "e-folder.h"
 #include <libedataserver/e-account-list.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/servers/exchange/storage/exchange-folder-size.c
==============================================================================
--- trunk/servers/exchange/storage/exchange-folder-size.c	(original)
+++ trunk/servers/exchange/storage/exchange-folder-size.c	Fri Jun  6 13:56:33 2008
@@ -26,12 +26,7 @@
 #include <string.h>
 
 #include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "exchange-hierarchy-webdav.h"
 #include "e-folder-exchange.h"

Modified: trunk/servers/exchange/storage/exchange-folder-size.h
==============================================================================
--- trunk/servers/exchange/storage/exchange-folder-size.h	(original)
+++ trunk/servers/exchange/storage/exchange-folder-size.h	Fri Jun  6 13:56:33 2008
@@ -6,8 +6,7 @@
 
 #include "exchange-types.h"
 #include "e2k-security-descriptor.h"
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/servers/exchange/storage/exchange-oof.h
==============================================================================
--- trunk/servers/exchange/storage/exchange-oof.h	(original)
+++ trunk/servers/exchange/storage/exchange-oof.h	Fri Jun  6 13:56:33 2008
@@ -5,7 +5,7 @@
 #define __EXCHANGE_OOF_H__
 
 #include "exchange-types.h"
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/servers/exchange/xntlm/xntlm-des.h
==============================================================================
--- trunk/servers/exchange/xntlm/xntlm-des.h	(original)
+++ trunk/servers/exchange/xntlm/xntlm-des.h	Fri Jun  6 13:56:33 2008
@@ -4,7 +4,7 @@
 #ifndef _XNTLM_DES_H
 #define _XNTLM_DES_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 typedef guint32 XNTLM_DES_KS[16][2];
 

Modified: trunk/servers/exchange/xntlm/xntlm-md4.c
==============================================================================
--- trunk/servers/exchange/xntlm/xntlm-md4.c	(original)
+++ trunk/servers/exchange/xntlm/xntlm-md4.c	Fri Jun  6 13:56:33 2008
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "xntlm-md4.h"
 
 #include <string.h>

Modified: trunk/servers/groupwise/create-account.c
==============================================================================
--- trunk/servers/groupwise/create-account.c	(original)
+++ trunk/servers/groupwise/create-account.c	Fri Jun  6 13:56:33 2008
@@ -1,7 +1,7 @@
 
 #include <config.h>
 #include <gconf/gconf-client.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include <libedataserver/e-source-list.h>
 
 static GConfClient *conf_client;

Modified: trunk/servers/groupwise/soap-test.c
==============================================================================
--- trunk/servers/groupwise/soap-test.c	(original)
+++ trunk/servers/groupwise/soap-test.c	Fri Jun  6 13:56:33 2008
@@ -1,5 +1,5 @@
 #include <config.h>
-#include <glib/gmain.h>
+#include <glib.h>
 #include "e-gw-connection.h"
 
 static GMainLoop *main_loop;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]