aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-04-03 04:41:47 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-04-03 04:59:20 +0800
commitfabb6b035c40673e7c263040db323d6b7607606e (patch)
tree9a8e69eb428a4e61c88c5fb998c7a46676c09e06 /calendar
parent6ea092ac02df94ea04d471b0e49d833cb374d655 (diff)
downloadgsoc2013-evolution-fabb6b035c40673e7c263040db323d6b7607606e.tar.gz
gsoc2013-evolution-fabb6b035c40673e7c263040db323d6b7607606e.tar.zst
gsoc2013-evolution-fabb6b035c40673e7c263040db323d6b7607606e.zip
Only #include Camel's top-level header.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/Makefile.am3
-rw-r--r--calendar/gui/alarm-notify/notify-main.c2
-rw-r--r--calendar/gui/dialogs/Makefile.am3
-rw-r--r--calendar/gui/dialogs/comp-editor.c10
-rw-r--r--calendar/gui/e-cal-component-preview.c1
-rw-r--r--calendar/gui/itip-utils.c1
6 files changed, 5 insertions, 15 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 167c1b082d..d650a61954 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -75,7 +75,8 @@ libevolution_calendar_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBSOUP_CFLAGS) \
- $(EVOLUTION_CALENDAR_CFLAGS)
+ $(EVOLUTION_CALENDAR_CFLAGS) \
+ $(CAMEL_CFLAGS)
ui_DATA = \
e-itip-control.ui \
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 71fee19537..086707eae8 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -31,7 +31,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <unique/unique.h>
-#include <camel/camel-object.h>
+#include <camel/camel.h>
#include <libedataserver/e-source.h>
#include <libedataserverui/e-passwords.h>
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 6e9cb26c05..0bd89de799 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -15,7 +15,8 @@ libcal_dialogs_la_CPPFLAGS = \
-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(GNOME_PLATFORM_CFLAGS) \
- $(EVOLUTION_CALENDAR_CFLAGS)
+ $(EVOLUTION_CALENDAR_CFLAGS) \
+ $(CAMEL_CFLAGS)
ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 5fe874d476..16f981785f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -41,16 +41,6 @@
#include <e-util/gconf-bridge.h>
#include <shell/e-shell.h>
-#include <camel/camel-url.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
-#include "mail/mail-tools.h"
-
#include "../print.h"
#include "../comp-util.h"
#include "save-comp.h"
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index dbc0fc884f..9caebe9e1c 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -33,7 +33,6 @@
#include <e-util/e-util.h>
#include <e-util/e-categories-config.h>
#include "calendar-config.h"
-#include <camel/camel-mime-filter-tohtml.h>
#define E_CAL_COMPONENT_PREVIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 9fe0f1bdb6..f686ac5e73 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -38,7 +38,6 @@
#include "dialogs/comp-editor-util.h"
#include <composer/e-msg-composer.h>
-#include <camel/camel-mime-filter-tohtml.h>
static const gchar *itip_methods[] = {
"PUBLISH",