summaryrefslogtreecommitdiffstats
path: root/libkpimexchange/core
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /libkpimexchange/core
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkpimexchange/core')
-rw-r--r--libkpimexchange/core/exchangedownload.cpp2
-rw-r--r--libkpimexchange/core/exchangeupload.cpp2
-rw-r--r--libkpimexchange/core/utils.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index c8a0a2150..60879d266 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -49,7 +49,7 @@
#include <libkcal/calendarlocal.h>
extern "C" {
- #include <ical.h>
+ #include <libical/ical.h>
}
#include "exchangeclient.h"
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index bbc30906d..29a796dd8 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -33,7 +33,7 @@
#include <kio/http.h>
extern "C" {
- #include <ical.h>
+ #include <libical/ical.h>
}
#include <libkcal/event.h>
diff --git a/libkpimexchange/core/utils.cpp b/libkpimexchange/core/utils.cpp
index 61847dbdd..7e1cbadfe 100644
--- a/libkpimexchange/core/utils.cpp
+++ b/libkpimexchange/core/utils.cpp
@@ -21,7 +21,7 @@
#include <tqdatetime.h>
extern "C" {
- #include <ical.h>
+ #include <libical/ical.h>
}
#include "utils.h"