[evolution-ews] Normalize -I directives.

From: Matthew Barnes <mbarnes src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-ews] Normalize -I directives.
Date: Sun, 13 May 2012 14:10:10 +0000 (UTC)
commit c93820745cf23ff83332ae852484dca45ae42bd7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue May 8 13:02:41 2012 -0400

    Normalize -I directives.
    
    List only:
    
      $(top_srcdir)
      $(top_srcdir)/src
      $(top_builddir)
      $(top_builddir)/src
    
    This makes it clearer in the source code where header files are coming
    from.  Also use quoted file paths instead of bracketed file paths when
    including EWS header files.

 src/account-setup-eplugin/Makefile.am              |    7 ++-----
 .../exchange-ews-account-listener.c                |    8 +++++---
 .../exchange-ews-account-out-of-office.c           |    9 ++++++---
 .../exchange-ews-account-setup.c                   |   20 +++++++++++++-------
 src/addressbook/Makefile.am                        |    7 ++++---
 src/addressbook/e-book-backend-ews.c               |   11 ++++++-----
 src/addressbook/e-book-backend-sqlitedb.c          |    8 +++++---
 src/calendar/Makefile.am                           |    7 ++-----
 src/calendar/e-cal-backend-ews-utils.c             |    8 +++++---
 src/calendar/e-cal-backend-ews-utils.h             |    6 ++++--
 src/calendar/e-cal-backend-ews.c                   |   12 +++++++-----
 src/calendar/e-cal-backend-ews.h                   |    3 ++-
 src/camel/Makefile.am                              |    4 +---
 src/camel/camel-ews-folder.c                       |   12 +++++++-----
 src/camel/camel-ews-store.c                        |   10 ++++++----
 src/camel/camel-ews-store.h                        |    3 ++-
 src/camel/camel-ews-transport.c                    |    5 +++--
 src/camel/camel-ews-utils.c                        |    8 +++++---
 src/camel/camel-ews-utils.h                        |    4 +++-
 src/server/Makefile.am                             |    3 ++-
 src/server/tests/Makefile.am                       |    4 +++-
 src/server/tests/test-autocompletion.c             |    4 +++-
 src/server/tests/test-connection.c                 |    4 +++-
 src/server/tests/test-createfolder.c               |    8 +++++---
 src/server/tests/test-cuditem.c                    |    8 +++++---
 src/server/tests/test-deletefolder.c               |    8 +++++---
 src/server/tests/test-get-oof-settings.c           |    6 ++++--
 src/server/tests/test-getattachment.c              |    8 +++++---
 src/server/tests/test-getdelegate.c                |    8 +++++---
 src/server/tests/test-libews.c                     |    3 ++-
 src/server/tests/test-set-oof-settings.c           |    6 ++++--
 src/server/tests/test-syncfolder.c                 |    8 +++++---
 src/utils/Makefile.am                              |    4 ++--
 src/utils/e-ews-query-to-restriction.c             |    3 ++-
 src/utils/e-ews-query-to-restriction.h             |    4 ++--
 src/utils/ews-camel-common.c                       |    3 ++-
 src/utils/ews-camel-common.h                       |    3 ++-
 src/utils/ews-esource-utils.h                      |    3 ++-
 src/utils/ews-test-finditem-query.c                |    9 +++++----
 39 files changed, 156 insertions(+), 103 deletions(-)
---
diff --git a/src/account-setup-eplugin/Makefile.am b/src/account-setup-eplugin/Makefile.am
index 0a80477..d597335 100644
--- a/src/account-setup-eplugin/Makefile.am
+++ b/src/account-setup-eplugin/Makefile.am
@@ -53,12 +53,9 @@ liborg_gnome_exchange_ews_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_exchange_ews_la_CFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
 	-I$(top_builddir) \
-	-I$(top_srcdir)/src/camel \
-	-I$(top_builddir)/src/camel \
-	-I$(top_srcdir)/src/server \
-	-I$(top_builddir)/src/server \
-	-I$(top_srcdir)/src/utils \
+	-I$(top_builddir)/src \
 	$(LIBEWS_CFLAGS) \
 	$(LIBEMAIL_ENGINE_CFLAGS) \
 	$(NULL)
diff --git a/src/account-setup-eplugin/exchange-ews-account-listener.c b/src/account-setup-eplugin/exchange-ews-account-listener.c
index 4bece1e..10e1516 100644
--- a/src/account-setup-eplugin/exchange-ews-account-listener.c
+++ b/src/account-setup-eplugin/exchange-ews-account-listener.c
@@ -31,12 +31,14 @@
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 #include <libebook/e-book.h>
-#include <camel-ews-utils.h>
+
+#include "camel/camel-ews-store-summary.h"
+#include "camel/camel-ews-utils.h"
+
+#include "utils/ews-esource-utils.h"
 
 #include "exchange-ews-account-listener.h"
 #include "exchange-ews-account-setup.h"
-#include "camel-ews-store-summary.h"
-#include "ews-esource-utils.h"
 
 #define d(x)
 
diff --git a/src/account-setup-eplugin/exchange-ews-account-out-of-office.c b/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
index e491f3b..78b2529 100644
--- a/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
+++ b/src/account-setup-eplugin/exchange-ews-account-out-of-office.c
@@ -23,17 +23,20 @@
 #include "config.h"
 #endif
 
+#include "exchange-ews-account-out-of-office.h"
+
 #include <string.h>
 #include <unistd.h>
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
-#include <e-ews-connection.h>
 #include <misc/e-dateedit.h>
-#include <camel-ews-settings.h>
 #include <e-util/e-dialog-utils.h>
 #include <libedataserverui/e-passwords.h>
-#include <exchange-ews-account-out-of-office.h>
+
+#include "server/e-ews-connection.h"
+
+#include "utils/camel-ews-settings.h"
 
 #define d(x) x
 
diff --git a/src/account-setup-eplugin/exchange-ews-account-setup.c b/src/account-setup-eplugin/exchange-ews-account-setup.c
index 9a2bbf3..49dd415 100644
--- a/src/account-setup-eplugin/exchange-ews-account-setup.c
+++ b/src/account-setup-eplugin/exchange-ews-account-setup.c
@@ -27,24 +27,30 @@
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
+
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/eds-version.h>
+
 #include <e-util/e-dialog-utils.h>
-#include "mail/em-config.h"
-#include "exchange-ews-account-setup.h"
+#include <mail/em-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
 #include <calendar/gui/e-cal-config.h>
-#include <exchange-ews-account-out-of-office.h>
 
 #include <camel/camel.h>
-#include <camel-ews-folder.h>
-#include <camel-ews-settings.h>
-#include <e-ews-connection.h>
-#include <camel-ews-utils.h>
 #include <shell/e-shell.h>
 
+#include "camel/camel-ews-folder.h"
+#include "camel/camel-ews-utils.h"
+
+#include "server/e-ews-connection.h"
+
+#include "utils/camel-ews-settings.h"
+
+#include "exchange-ews-account-out-of-office.h"
+#include "exchange-ews-account-setup.h"
+
 #define d(x) x
 
 #if GTK_CHECK_VERSION(2,24,0)
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index c750171..1f27017 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -7,9 +7,10 @@ ebook_backend_LTLIBRARIES = libebookbackendews.la
 libebookbackendews_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"libebookbackend\" \
-	-I$(top_srcdir)/src/addressbook \
-	-I$(top_srcdir)/src/server \
-	-I$(top_srcdir)/src/utils \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir) \
+	-I$(top_builddir)/src \
 	$(LIBEBACKEND_CFLAGS) \
 	$(LIBEDATASERVER_CFLAGS) \
 	$(LIBEBOOK_CFLAGS) \
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index c3a7386..debe694 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -48,12 +48,13 @@
 #include "e-book-backend-sqlitedb.h"
 #include "lzx/ews-oal-decompress.h"
 #include "ews-oab-decoder.h"
-#include "e-ews-item-change.h"
 
-#include "e-ews-message.h"
-#include "e-ews-connection.h"
-#include "e-ews-item.h"
-#include <e-ews-query-to-restriction.h>
+#include "server/e-ews-item-change.h"
+#include "server/e-ews-message.h"
+#include "server/e-ews-connection.h"
+#include "server/e-ews-item.h"
+
+#include "utils/e-ews-query-to-restriction.h"
 
 #define d(x) x
 
diff --git a/src/addressbook/e-book-backend-sqlitedb.c b/src/addressbook/e-book-backend-sqlitedb.c
index 5f4983e..4be8ab1 100644
--- a/src/addressbook/e-book-backend-sqlitedb.c
+++ b/src/addressbook/e-book-backend-sqlitedb.c
@@ -33,9 +33,11 @@
 
 #include <sqlite3.h>
 
-#include "libedataserver/e-sexp.h"
-#include "libedata-book/e-book-backend-sexp.h"
-#include "e-sqlite3-vfs.h"
+#include <libedataserver/e-sexp.h>
+#include <libedata-book/e-book-backend-sexp.h>
+
+#include "utils/e-sqlite3-vfs.h"
+
 #include "e-book-backend-sqlitedb.h"
 
 #define d(x)
diff --git a/src/calendar/Makefile.am b/src/calendar/Makefile.am
index 2c1d864..f7154bc 100644
--- a/src/calendar/Makefile.am
+++ b/src/calendar/Makefile.am
@@ -5,12 +5,9 @@ ecal_backend_LTLIBRARIES = libecalbackendews.la
 libecalbackendews_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
 	-I$(top_builddir) \
-	-I$(top_srcdir)/src/calendar \
-	-I$(top_builddir)/src/calendar \
-	-I$(top_srcdir)/src/server \
-	-I$(top_builddir)/src/server \
-	-I$(top_srcdir)/src/utils \
+	-I$(top_builddir)/src \
 	$(EVOLUTION_CALENDAR_CFLAGS) \
 	$(LIBEBACKEND_CFLAGS) \
 	$(LIBECAL_CFLAGS) \
diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
index 1a4f7b0..edfd485 100644
--- a/src/calendar/e-cal-backend-ews-utils.c
+++ b/src/calendar/e-cal-backend-ews-utils.c
@@ -32,13 +32,15 @@
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
-#include <e-ews-connection.h>
-#include <e-ews-message.h>
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-time-util.h>
 #include <libsoup/soup-misc.h>
+#include <libedataserver/e-source-list.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-message.h"
+
 #include "e-cal-backend-ews-utils.h"
-#include "libedataserver/e-source-list.h"
 
 /*
  * Iterate over the icalcomponent properties and collect attendees
diff --git a/src/calendar/e-cal-backend-ews-utils.h b/src/calendar/e-cal-backend-ews-utils.h
index 1fc6fb9..c28826c 100644
--- a/src/calendar/e-cal-backend-ews-utils.h
+++ b/src/calendar/e-cal-backend-ews-utils.h
@@ -21,12 +21,14 @@
 #ifndef E_CAL_BACKEND_EWS_UTILS_H
 #define E_CAL_BACKEND_EWS_UTILS_H
 
-#include <e-ews-connection.h>
 #include <libecal/e-cal-component.h>
-#include <e-cal-backend-ews.h>
 #include <libical/icaltime.h>
 #include <libical/icaltimezone.h>
 
+#include "server/e-ews-connection.h"
+
+#include "e-cal-backend-ews.h"
+
 G_BEGIN_DECLS
 #define MINUTES_IN_HOUR 60
 #define SECS_IN_MINUTE 60
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 9e18439..c3ca3ce 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -41,14 +41,16 @@
 #include <libical/icalproperty.h>
 #include <libical/icalparameter.h>
 #include <camel/camel.h>
-#include <ews-camel-common.h>
 #include <libedataserver/eds-version.h>
+
+#include "server/e-ews-item-change.h"
+#include "server/e-ews-message.h"
+#include "server/e-soap-response.h"
+
+#include "utils/ews-camel-common.h"
+
 #include "e-cal-backend-ews.h"
 #include "e-cal-backend-ews-utils.h"
-#include "e-ews-connection.h"
-#include "e-soap-response.h"
-#include "e-ews-message.h"
-#include "e-ews-item-change.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff --git a/src/calendar/e-cal-backend-ews.h b/src/calendar/e-cal-backend-ews.h
index a56ac55..3c22df3 100644
--- a/src/calendar/e-cal-backend-ews.h
+++ b/src/calendar/e-cal-backend-ews.h
@@ -22,7 +22,8 @@
 #define E_CAL_BACKEND_EWS_H
 
 #include <libedata-cal/e-cal-backend-sync.h>
-#include <e-ews-connection.h>
+
+#include "server/e-ews-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index 87ddd8e..cdcb0ad 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -5,10 +5,8 @@ camel_provider_DATA = libcamelews.urls
 
 libcamelews_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/camel \
-	-I$(top_srcdir)/src/server \
-	-I$(top_srcdir)/src/utils \
 	$(CAMEL_CFLAGS) \
 	$(LIBEDATASERVER_CFLAGS) \
 	$(LIBECAL_CFLAGS) \
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 64d391e..d413132 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -44,17 +44,19 @@ which needs to be better organized via functions */
 #include <libedataserver/e-flag.h>
 #include <libical/icalcomponent.h>
 #include <libical/icalparser.h>
-#include <e-ews-connection.h>
-#include <e-ews-item-change.h>
-#include <e-ews-message.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-item-change.h"
+#include "server/e-ews-message.h"
+
+#include "utils/ews-camel-common.h"
+#include "utils/camel-ews-settings.h"
 
 #include "camel-ews-folder.h"
 #include "camel-ews-private.h"
-#include "camel-ews-settings.h"
 #include "camel-ews-store.h"
 #include "camel-ews-summary.h"
 #include "camel-ews-utils.h"
-#include <ews-camel-common.h>
 
 #define EWS_MAX_FETCH_COUNT 100
 
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index 0f5b10d..7a1f95d 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -37,15 +37,17 @@
 #include <glib/gstdio.h>
 
 #include <libedataserver/e-flag.h>
-#include <e-ews-item-change.h>
-#include <e-ews-message.h>
+
+#include "server/e-ews-item-change.h"
+#include "server/e-ews-message.h"
+
+#include "utils/camel-ews-settings.h"
+#include "utils/ews-esource-utils.h"
 
 #include "camel-ews-folder.h"
-#include "camel-ews-settings.h"
 #include "camel-ews-store.h"
 #include "camel-ews-summary.h"
 #include "camel-ews-utils.h"
-#include "ews-esource-utils.h"
 
 #ifdef G_OS_WIN32
 #include <winsock2.h>
diff --git a/src/camel/camel-ews-store.h b/src/camel/camel-ews-store.h
index a159325..f7e1b31 100644
--- a/src/camel/camel-ews-store.h
+++ b/src/camel/camel-ews-store.h
@@ -26,7 +26,8 @@
 
 #include <camel/camel.h>
 
-#include <e-ews-connection.h>
+#include "server/e-ews-connection.h"
+
 #include "camel-ews-store-summary.h"
 
 /* Standard GObject macros */
diff --git a/src/camel/camel-ews-transport.c b/src/camel/camel-ews-transport.c
index 96154f0..6cc575b 100644
--- a/src/camel/camel-ews-transport.c
+++ b/src/camel/camel-ews-transport.c
@@ -30,11 +30,12 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "camel-ews-settings.h"
+#include "utils/camel-ews-settings.h"
+#include "utils/ews-camel-common.h"
+
 #include "camel-ews-store.h"
 #include "camel-ews-transport.h"
 #include "camel-ews-utils.h"
-#include <ews-camel-common.h>
 
 #define REPLY_VIEW "default message attachments threading"
 
diff --git a/src/camel/camel-ews-utils.c b/src/camel/camel-ews-utils.c
index 66f13e0..701e81b 100644
--- a/src/camel/camel-ews-utils.c
+++ b/src/camel/camel-ews-utils.c
@@ -30,10 +30,12 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 
-#include "camel-ews-settings.h"
+#include "server/e-ews-message.h"
+
+#include "utils/camel-ews-settings.h"
+#include "utils/ews-esource-utils.h"
+
 #include "camel-ews-utils.h"
-#include "ews-esource-utils.h"
-#include "e-ews-message.h"
 
 #define SUBFOLDER_DIR_NAME     "subfolders"
 #define SUBFOLDER_DIR_NAME_LEN 10
diff --git a/src/camel/camel-ews-utils.h b/src/camel/camel-ews-utils.h
index 6b2f106..69ff55a 100644
--- a/src/camel/camel-ews-utils.h
+++ b/src/camel/camel-ews-utils.h
@@ -21,7 +21,9 @@
 #define CAMEL_EWS_UTILS_H
 
 #include <camel/camel.h>
-#include <e-ews-connection.h>
+
+#include "server/e-ews-connection.h"
+
 #include "camel-ews-store.h"
 #include "camel-ews-folder.h"
 
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 3e33d7c..3df8d3e 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -22,8 +22,9 @@ libeews_1_2_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"libeews\" \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
 	-I$(top_builddir) \
-	-I$(top_builddir)/src/server \
+	-I$(top_builddir)/src \
 	$(SOUP_CFLAGS) \
 	$(LIBECAL_CFLAGS) \
 	$(LIBICAL_CFLAGS) \
diff --git a/src/server/tests/Makefile.am b/src/server/tests/Makefile.am
index 0e0724a..7be8cb4 100644
--- a/src/server/tests/Makefile.am
+++ b/src/server/tests/Makefile.am
@@ -5,7 +5,9 @@ NULL =
 SERVERS_EWS_CPPFLAGS= \
 	-DG_LOG_DOMAIN=\"libeews\" \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
 	-I$(top_builddir) \
+	-I$(top_builddir)/src \
 	$(SOUP_CFLAGS) \
 	$(EVOLUTION_DATA_SERVER_CFLAGS) \
 	$(LIBEDATASERVER_CFLAGS) \
@@ -36,7 +38,7 @@ testews_SOURCES =  \
 
 #Fixme: Ugly. Kill me later
 testews_LDADD = $(LIBEDATASERVER_LIBS) $(libeews)
-testews_CPPFLAGS = $(SERVERS_EWS_CPPFLAGS) -I$(top_srcdir)/src/server/
+testews_CPPFLAGS = $(SERVERS_EWS_CPPFLAGS)
 
 DISTCLEANFILES = $(TEST_PROGS)
 
diff --git a/src/server/tests/test-autocompletion.c b/src/server/tests/test-autocompletion.c
index de93cf1..d9144eb 100644
--- a/src/server/tests/test-autocompletion.c
+++ b/src/server/tests/test-autocompletion.c
@@ -26,8 +26,10 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
 
 void autocompletion_tests_run ();
 
diff --git a/src/server/tests/test-connection.c b/src/server/tests/test-connection.c
index dc9a646..b6c531d 100644
--- a/src/server/tests/test-connection.c
+++ b/src/server/tests/test-connection.c
@@ -26,8 +26,10 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
 
 static void con_test_create_new_connection ();
 void connection_tests_run ();
diff --git a/src/server/tests/test-createfolder.c b/src/server/tests/test-createfolder.c
index 13dd411..6b45ee3 100644
--- a/src/server/tests/test-createfolder.c
+++ b/src/server/tests/test-createfolder.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-folder.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-folder.h>
-#include <e-ews-message.h>
 
 void createfolder_tests_run ();
 
diff --git a/src/server/tests/test-cuditem.c b/src/server/tests/test-cuditem.c
index d817bd2..b7af490 100644
--- a/src/server/tests/test-cuditem.c
+++ b/src/server/tests/test-cuditem.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-item.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-item.h>
-#include <e-ews-message.h>
 
 static void op_test_create_item ();
 void cuditem_tests_run ();
diff --git a/src/server/tests/test-deletefolder.c b/src/server/tests/test-deletefolder.c
index a91e78f..deabf97 100644
--- a/src/server/tests/test-deletefolder.c
+++ b/src/server/tests/test-deletefolder.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-folder.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-folder.h>
-#include <e-ews-message.h>
 
 static GMainLoop *main_loop;
 
diff --git a/src/server/tests/test-get-oof-settings.c b/src/server/tests/test-get-oof-settings.c
index c8f4be0..abfda43 100644
--- a/src/server/tests/test-get-oof-settings.c
+++ b/src/server/tests/test-get-oof-settings.c
@@ -26,9 +26,11 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-message.h>
 
 void get_oof_settings_test_run ();
 static GMainLoop *main_loop;
diff --git a/src/server/tests/test-getattachment.c b/src/server/tests/test-getattachment.c
index a763267..6afee9a 100644
--- a/src/server/tests/test-getattachment.c
+++ b/src/server/tests/test-getattachment.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-item.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-item.h>
-#include <e-ews-message.h>
 
 static void op_test_get_attachments ();
 void get_attachments_tests_run ();
diff --git a/src/server/tests/test-getdelegate.c b/src/server/tests/test-getdelegate.c
index 35ff33a..2afbd37 100644
--- a/src/server/tests/test-getdelegate.c
+++ b/src/server/tests/test-getdelegate.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-folder.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-folder.h>
-#include <e-ews-message.h>
 
 void get_delegate_tests_run ();
 
diff --git a/src/server/tests/test-libews.c b/src/server/tests/test-libews.c
index b9bdf8f..5fdced4 100644
--- a/src/server/tests/test-libews.c
+++ b/src/server/tests/test-libews.c
@@ -2,7 +2,8 @@
 #include <stdio.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <e-ews-folder.h>
+
+#include "server/e-ews-folder.h"
 
 /* Test result of created folder id */
 extern EwsFolderId *folder_id;
diff --git a/src/server/tests/test-set-oof-settings.c b/src/server/tests/test-set-oof-settings.c
index b9fbda4..413a29b 100644
--- a/src/server/tests/test-set-oof-settings.c
+++ b/src/server/tests/test-set-oof-settings.c
@@ -26,9 +26,11 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-message.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-message.h>
 
 void set_oof_settings_test_run ();
 static GMainLoop *main_loop;
diff --git a/src/server/tests/test-syncfolder.c b/src/server/tests/test-syncfolder.c
index b4dd79d..7c22906 100644
--- a/src/server/tests/test-syncfolder.c
+++ b/src/server/tests/test-syncfolder.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-folder.h"
+#include "server/e-ews-item.h"
+
 #include "utils.h"
-#include <e-ews-connection.h>
-#include <e-ews-folder.h>
-#include <e-ews-item.h>
 
 static void op_test_get_item ();
 void op_tests_run ();
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 20fd6cc..0d5e8d8 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -6,9 +6,9 @@ libewsutils_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-DG_LOG_DOMAIN=\"libeews\" \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/src/server \
+	-I$(top_srcdir)/src \
 	-I$(top_builddir) \
-	-I$(top_builddir)/src/server \
+	-I$(top_builddir)/src \
 	$(LIBEDATASERVER_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(DEBUG_CFLAGS) \
diff --git a/src/utils/e-ews-query-to-restriction.c b/src/utils/e-ews-query-to-restriction.c
index 079eb79..2521cc8 100644
--- a/src/utils/e-ews-query-to-restriction.c
+++ b/src/utils/e-ews-query-to-restriction.c
@@ -28,9 +28,10 @@
 #include <libedata-cal/e-cal-backend-sexp.h>
 #include "libedataserver/e-sexp.h"
 #include "e-ews-query-to-restriction.h"
-#include "e-ews-message.h"
 #include <camel/camel.h>
 
+#include "server/e-ews-message.h"
+
 #define d(x) x
 
 #define WRITE_CONTAINS_MESSAGE(msg, mode, compare, uri, val) \
diff --git a/src/utils/e-ews-query-to-restriction.h b/src/utils/e-ews-query-to-restriction.h
index bb1202b..f369f4c 100644
--- a/src/utils/e-ews-query-to-restriction.h
+++ b/src/utils/e-ews-query-to-restriction.h
@@ -20,7 +20,7 @@
  * USA
  */
 
-#include "e-soap-message.h"
-#include "e-ews-folder.h"
+#include "server/e-soap-message.h"
+#include "server/e-ews-folder.h"
 
 void		e_ews_query_to_restriction (ESoapMessage *msg, const gchar *query, EwsFolderType type);
diff --git a/src/utils/ews-camel-common.c b/src/utils/ews-camel-common.c
index 3afca67..0a3941c 100644
--- a/src/utils/ews-camel-common.c
+++ b/src/utils/ews-camel-common.c
@@ -26,7 +26,8 @@
 #include <glib/gstdio.h>
 
 #include "ews-camel-common.h"
-#include "e-ews-message.h"
+
+#include "server/e-ews-message.h"
 
 struct _create_mime_msg_data {
 	CamelMimeMessage *message;
diff --git a/src/utils/ews-camel-common.h b/src/utils/ews-camel-common.h
index 89a9dec..f292aa6 100644
--- a/src/utils/ews-camel-common.h
+++ b/src/utils/ews-camel-common.h
@@ -21,7 +21,8 @@
 #define	EWS_CAMEL_COMMON_H
 
 #include <camel/camel.h>
-#include <e-ews-connection.h>
+
+#include "server/e-ews-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/utils/ews-esource-utils.h b/src/utils/ews-esource-utils.h
index 9ebf5d5..d144a8a 100644
--- a/src/utils/ews-esource-utils.h
+++ b/src/utils/ews-esource-utils.h
@@ -22,7 +22,8 @@
 
 #include <libedataserver/e-source-list.h>
 #include <camel/camel.h>
-#include <e-ews-folder.h>
+
+#include "server/e-ews-folder.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/utils/ews-test-finditem-query.c b/src/utils/ews-test-finditem-query.c
index 2ca6486..c548e0b 100644
--- a/src/utils/ews-test-finditem-query.c
+++ b/src/utils/ews-test-finditem-query.c
@@ -26,10 +26,11 @@
 #include <ctype.h>
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <e-ews-connection.h>
-#include <e-ews-folder.h>
-#include <e-ews-item.h>
-#include <e-ews-query-to-restriction.h>
+
+#include "server/e-ews-connection.h"
+#include "server/e-ews-folder.h"
+#include "server/e-ews-item.h"
+#include "utils/e-ews-query-to-restriction.h"
 
 /*Some simple queries are defined here we can replace them to more complex ones;
  * based on these restriction you might not get items at all, to get all items use NULL */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]