[evolution-groupwise] Include only allowed includes in eds 3.6.x

[Fridrich Strba <strba src gnome org>]

commit b6c9d6e617068393c49e0bef9b25de11bf1cae2b
Author: Fridrich Åtrba <fridrich strba bluewin ch>
Date:   Thu Nov 29 10:06:18 2012 +0100

    Include only allowed includes in eds 3.6.x

 src/addressbook/create-account.c                   |    2 +-
 src/addressbook/e-book-backend-groupwise-factory.c |    2 +-
 src/addressbook/e-book-backend-groupwise.c         |   16 ++++------------
 src/addressbook/e-book-backend-groupwise.h         |    2 +-
 src/calendar/e-cal-backend-groupwise-factory.c     |    2 +-
 src/calendar/e-cal-backend-groupwise-utils.c       |    5 ++---
 src/calendar/e-cal-backend-groupwise-utils.h       |    2 +-
 src/calendar/e-cal-backend-groupwise.c             |   11 +++--------
 src/calendar/e-cal-backend-groupwise.h             |    2 +-
 src/plugins/addressbook-groupwise.c                |    3 +--
 src/plugins/camel-gw-listener.c                    |    4 ++--
 src/plugins/camel-gw-listener.h                    |    4 +---
 src/plugins/mail-send-options.c                    |    2 +-
 src/plugins/process-meeting.c                      |    2 +-
 src/plugins/proxy-login.c                          |    5 ++---
 src/plugins/proxy.c                                |    7 ++-----
 src/plugins/send-options.c                         |    7 +++----
 src/plugins/share-folder.c                         |    2 +-
 src/plugins/share-folder.h                         |    2 +-
 src/server/create-account.c                        |    2 +-
 src/server/e-gw-connection.c                       |    2 +-
 21 files changed, 32 insertions(+), 54 deletions(-)
---
diff --git a/src/addressbook/create-account.c b/src/addressbook/create-account.c
index 7be8d96..671e486 100644
--- a/src/addressbook/create-account.c
+++ b/src/addressbook/create-account.c
@@ -2,7 +2,7 @@
 #include <config.h>
 #include <gconf/gconf-client.h>
 #include <glib.h>
-#include "libedataserver/e-source-list.h"
+#include <libedataserver/libedataserver.h>
 
 static GConfClient *conf_client;
 static GMainLoop *main_loop;
diff --git a/src/addressbook/e-book-backend-groupwise-factory.c b/src/addressbook/e-book-backend-groupwise-factory.c
index 7789ae4..aaacc7f 100644
--- a/src/addressbook/e-book-backend-groupwise-factory.c
+++ b/src/addressbook/e-book-backend-groupwise-factory.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <libedata-book/e-book-backend-factory.h>
+#include <libedata-book/libedata-book.h>
 #include "e-book-backend-groupwise.h"
 
 #define FACTORY_NAME "groupwise"
diff --git a/src/addressbook/e-book-backend-groupwise.c b/src/addressbook/e-book-backend-groupwise.c
index 6b54581..8076abf 100644
--- a/src/addressbook/e-book-backend-groupwise.c
+++ b/src/addressbook/e-book-backend-groupwise.c
@@ -37,19 +37,11 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
-#include "libebackend/e-db3-utils.h"
-
-#include "libedataserver/e-sexp.h"
-#include "libedataserver/e-data-server-util.h"
-#include "libedataserver/e-flag.h"
-#include "libedataserver/e-url.h"
-#include "libebook/e-contact.h"
-#include "libebook/e-destination.h"
-#include "libedata-book/e-book-backend-sexp.h"
-#include "libedata-book/e-data-book.h"
-#include "libedata-book/e-data-book-view.h"
-#include "libedata-book/e-book-backend-db-cache.h"
-#include "libedata-book/e-book-backend-summary.h"
+#include <libebackend/libebackend.h>
+
+#include <libedataserver/libedataserver.h>
+#include <libebook/libebook.h"
+#include <libedata-book/libedata-book.h>
 #include "e-book-backend-groupwise.h"
 
 #include "e-gw-connection.h"
diff --git a/src/addressbook/e-book-backend-groupwise.h b/src/addressbook/e-book-backend-groupwise.h
index 080d6a4..240e7bb 100644
--- a/src/addressbook/e-book-backend-groupwise.h
+++ b/src/addressbook/e-book-backend-groupwise.h
@@ -24,7 +24,7 @@
 #ifndef __E_BOOK_BACKEND_GROUPWISE_H__
 #define __E_BOOK_BACKEND_GROUPWISE_H__
 
-#include <libedata-book/e-book-backend-sync.h>
+#include <libedata-book/libedata-book.h>
 #include "db.h"
 
 #define E_TYPE_BOOK_BACKEND_GROUPWISE        (e_book_backend_groupwise_get_type ())
diff --git a/src/calendar/e-cal-backend-groupwise-factory.c b/src/calendar/e-cal-backend-groupwise-factory.c
index db960f8..2ff3937 100644
--- a/src/calendar/e-cal-backend-groupwise-factory.c
+++ b/src/calendar/e-cal-backend-groupwise-factory.c
@@ -9,7 +9,7 @@
 
 #include <config.h>
 
-#include <libedata-cal/e-cal-backend-factory.h>
+#include <libedata-cal/libedata-cal.h>
 #include "e-cal-backend-groupwise.h"
 
 #define FACTORY_NAME "groupwise"
diff --git a/src/calendar/e-cal-backend-groupwise-utils.c b/src/calendar/e-cal-backend-groupwise-utils.c
index 0fdd4d9..28dd27d 100644
--- a/src/calendar/e-cal-backend-groupwise-utils.c
+++ b/src/calendar/e-cal-backend-groupwise-utils.c
@@ -40,11 +40,10 @@
 
 #include <e-gw-connection.h>
 #include <e-gw-message.h>
-#include <libecal/e-cal-recur.h>
-#include <libecal/e-cal-time-util.h>
+#include <libecal/libecal.h>
 #include <libsoup/soup-misc.h>
 #include "e-cal-backend-groupwise-utils.h"
-#include "libedataserver/e-source-list.h"
+#include <libedataserver/libedataserver.h>
 
 static gboolean
 get_recur_instance (ECalComponent *comp,
diff --git a/src/calendar/e-cal-backend-groupwise-utils.h b/src/calendar/e-cal-backend-groupwise-utils.h
index 5905e79..bf10f82 100644
--- a/src/calendar/e-cal-backend-groupwise-utils.h
+++ b/src/calendar/e-cal-backend-groupwise-utils.h
@@ -25,7 +25,7 @@
 #define E_CAL_BACKEND_GROUPWISE_UTILS_H
 
 #include <e-gw-connection.h>
-#include <libecal/e-cal-component.h>
+#include <libecal/libecal.h>
 #include <e-cal-backend-groupwise.h>
 
 G_BEGIN_DECLS
diff --git a/src/calendar/e-cal-backend-groupwise.c b/src/calendar/e-cal-backend-groupwise.c
index a4e86d0..0249716 100644
--- a/src/calendar/e-cal-backend-groupwise.c
+++ b/src/calendar/e-cal-backend-groupwise.c
@@ -33,14 +33,9 @@
 #include <unistd.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-xml-hash-utils.h>
-#include <libedataserver/e-url.h>
-#include <libedata-cal/e-cal-backend-cache.h>
-#include <libedata-cal/e-cal-backend-file-store.h>
-#include <libedata-cal/e-cal-backend-util.h>
-#include <libecal/e-cal-component.h>
-#include <libecal/e-cal-time-util.h>
+#include <libedataserver/libedataserver.h>
+#include <libedata-cal/libedata-cal.h>
+#include <libecal/libecal.h>
 #include "e-cal-backend-groupwise.h"
 #include "e-cal-backend-groupwise-utils.h"
 #include "e-gw-connection.h"
diff --git a/src/calendar/e-cal-backend-groupwise.h b/src/calendar/e-cal-backend-groupwise.h
index 618e9c8..5d1ff2f 100644
--- a/src/calendar/e-cal-backend-groupwise.h
+++ b/src/calendar/e-cal-backend-groupwise.h
@@ -24,7 +24,7 @@
 #ifndef E_CAL_BACKEND_GROUPWISE_H
 #define E_CAL_BACKEND_GROUPWISE_H
 
-#include <libedata-cal/e-cal-backend-sync.h>
+#include <libedata-cal/libedata-cal.h>
 #include "server/e-gw-connection.h"
 
 G_BEGIN_DECLS
diff --git a/src/plugins/addressbook-groupwise.c b/src/plugins/addressbook-groupwise.c
index b9f3aed..f39da42 100644
--- a/src/plugins/addressbook-groupwise.c
+++ b/src/plugins/addressbook-groupwise.c
@@ -26,8 +26,7 @@
 #include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-group.h>
+#include <libedataserver/libedataserver.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index ea2e1da..dc2f6ee 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -31,9 +31,9 @@
 #include <glib/gi18n-lib.h>
 #include <camel/camel.h>
 #include <e-gw-connection.h>
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
 #include <libevolution-utils/e-alert-dialog.h>
-#include <libecal/e-cal-client.h>
+#include <libecal/libecal.h>
 #include <shell/e-shell.h>
 #include <libemail-utils/e-account-utils.h>
 
diff --git a/src/plugins/camel-gw-listener.h b/src/plugins/camel-gw-listener.h
index cc545de..12f035e 100644
--- a/src/plugins/camel-gw-listener.h
+++ b/src/plugins/camel-gw-listener.h
@@ -24,9 +24,7 @@
 #ifndef CAMEL_GW_LISTENER_H
 #define CAMEL_GW_LISTENER_H
 
-#include <libedataserver/e-account-list.h>
-#include<libedataserver/e-source.h>
-#include<libedataserver/e-source-list.h>
+#include <libedataserver/libedataserver.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/plugins/mail-send-options.c b/src/plugins/mail-send-options.c
index 459ee27..1a33708 100644
--- a/src/plugins/mail-send-options.c
+++ b/src/plugins/mail-send-options.c
@@ -43,7 +43,7 @@
 
 #include "composer/e-msg-composer.h"
 #include "composer/e-composer-from-header.h"
-#include "libedataserver/e-account.h"
+#include <libedataserver/libedataserver.h>
 
 #include "misc/e-send-options.h"
 
diff --git a/src/plugins/process-meeting.c b/src/plugins/process-meeting.c
index 20de24c..d58cab5 100644
--- a/src/plugins/process-meeting.c
+++ b/src/plugins/process-meeting.c
@@ -30,7 +30,7 @@
 #include <glib/gstdio.h>
 #include <fcntl.h>
 #include <gtk/gtk.h>
-#include <libecal/e-cal-client.h>
+#include <libecal/libecal.h>
 
 #include <libevolution-utils/e-alert-dialog.h>
 #include <shell/e-shell-view.h>
diff --git a/src/plugins/proxy-login.c b/src/plugins/proxy-login.c
index 06ba9a7..87114a5 100644
--- a/src/plugins/proxy-login.c
+++ b/src/plugins/proxy-login.c
@@ -28,14 +28,14 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
 #include <libemail-utils/e-account-utils.h>
 #include <mail/em-folder-tree.h>
 #include <mail/e-mail-backend.h>
 #include <mail/e-mail-ui-session.h>
 #include <mail/em-folder-selector.h>
 #include <mail/em-account-editor.h>
-#include <libedataserver/e-account.h>
+#include <libedataserver/libedataserver.h>
 #include <e-util/e-util.h>
 #include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-icon-factory.h>
@@ -45,7 +45,6 @@
 #include <e-gw-container.h>
 #include <e-gw-connection.h>
 #include <e-gw-message.h>
-#include <libedataserverui/e-name-selector.h>
 
 #include "gw-ui.h"
 #include "proxy-login.h"
diff --git a/src/plugins/proxy.c b/src/plugins/proxy.c
index d7b9a67..5e6246f 100644
--- a/src/plugins/proxy.c
+++ b/src/plugins/proxy.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserverui/e-contact-store.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <e-util/e-util.h>
 #include <libevolution-utils/e-alert-dialog.h>
@@ -40,12 +40,9 @@
 #include <mail/em-config.h>
 #include <mail/e-mail-backend.h>
 #include <shell/e-shell.h>
-#include <libedataserver/e-account.h>
-#include <libedataserver/e-account-list.h>
+#include <libedataserver/libedataserver.h>
 #include <e-util/e-icon-factory.h>
 
-#include <libedataserverui/e-passwords.h>
-#include <libedataserverui/e-name-selector.h>
 #include <proxy.h>
 #include <string.h>
 
diff --git a/src/plugins/send-options.c b/src/plugins/send-options.c
index ee5482f..ae1b439 100644
--- a/src/plugins/send-options.c
+++ b/src/plugins/send-options.c
@@ -30,13 +30,12 @@
 #include "camel-groupwise-settings.h"
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
-#include "libedataserver/e-account.h"
 #include <misc/e-send-options.h>
 #include <mail/em-config.h>
 #include <e-gw-connection.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-source-list.h>
-#include <libedataserverui/e-passwords.h>
+#include <libecal/libecal.h>
+#include <libedataserver/libedataserver.h>
+#include <libedataserverui/libedataserverui.h>
 
 ESendOptionsDialog *sod = NULL;
 GtkWidget *parent;
diff --git a/src/plugins/share-folder.c b/src/plugins/share-folder.c
index f747b11..ee88afe 100644
--- a/src/plugins/share-folder.c
+++ b/src/plugins/share-folder.c
@@ -25,7 +25,7 @@
 #endif
 #include "share-folder.h"
 #include <glib/gi18n-lib.h>
-#include <libedataserverui/e-contact-store.h>
+#include <libedataserverui/libedataserverui.h>
 #include <e-util/e-util.h>
 #include <libevolution-utils/e-alert-dialog.h>
 #include <e-gw-container.h>
diff --git a/src/plugins/share-folder.h b/src/plugins/share-folder.h
index 2f4bf0c..dcf0730 100644
--- a/src/plugins/share-folder.h
+++ b/src/plugins/share-folder.h
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 #include <e-gw-connection.h>
-#include <libedataserverui/e-name-selector.h>
+#include <libedataserverui/libedataserverui.h>
 
 #define _SHARE_FOLDER_TYPE	      (share_folder_get_type ())
 #define SHARE_FOLDER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SHARE_FOLDER, ShareFolder))
diff --git a/src/server/create-account.c b/src/server/create-account.c
index a462524..66cbc90 100644
--- a/src/server/create-account.c
+++ b/src/server/create-account.c
@@ -2,7 +2,7 @@
 #include <config.h>
 #include <gconf/gconf-client.h>
 #include <glib.h>
-#include <libedataserver/e-source-list.h>
+#include <libedataserver/libedataserver.h>
 
 static GConfClient *conf_client;
 static GMainLoop *main_loop;
diff --git a/src/server/e-gw-connection.c b/src/server/e-gw-connection.c
index ed8efc8..4215c8a 100644
--- a/src/server/e-gw-connection.c
+++ b/src/server/e-gw-connection.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-proxy.h>
+#include <libedataserver/libedataserver.h>
 #include <libsoup/soup.h>
 #include "soup-soap-message.h"
 #include "e-gw-connection.h"