Branch 'libkolab-0.5' - kolabformat/kolabdefinitions.h kolabformat/kolabobject.cpp
Christian Mollekopf
mollekopf at kolabsys.com
Mon Nov 18 09:45:12 CET 2013
kolabformat/kolabdefinitions.h | 1 +
kolabformat/kolabobject.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit da56708f63e626dd167a5c14697e8df31dec22e6
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Sun Nov 17 20:52:04 2013 +0100
Detect if the version is explicitly set to version 2.0.
Apparently some roundcube versions generate such headers.
Patch contributed by David Faure.
diff --git a/kolabformat/kolabdefinitions.h b/kolabformat/kolabdefinitions.h
index 4169aa1..6bde0c2 100644
--- a/kolabformat/kolabdefinitions.h
+++ b/kolabformat/kolabdefinitions.h
@@ -43,6 +43,7 @@ namespace Kolab {
#define X_KOLAB_TYPE_HEADER "X-Kolab-Type"
#define X_KOLAB_MIME_VERSION_HEADER "X-Kolab-Mime-Version"
#define X_KOLAB_MIME_VERSION_HEADER_COMPAT "X-Kolab-Version"
+#define KOLAB_VERSION_V2 "2.0"
#define KOLAB_VERSION_V3 "3.0"
#define KOLAB_OBJECT_FILENAME "kolab.xml"
diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
index 9774633..0619e3f 100644
--- a/kolabformat/kolabobject.cpp
+++ b/kolabformat/kolabobject.cpp
@@ -378,7 +378,7 @@ ObjectType KolabObjectReader::parseMimeMessage(const KMime::Message::Ptr &msg)
//For backwards compatibility to development versions, can be removed in future versions
xKolabVersion = msg->getHeaderByType(X_KOLAB_MIME_VERSION_HEADER_COMPAT);
}
- if (!xKolabVersion) {
+ if (!xKolabVersion || xKolabVersion->asUnicodeString() == KOLAB_VERSION_V2) {
d->mVersion = KolabV2;
} else {
if (xKolabVersion->asUnicodeString() != KOLAB_VERSION_V3) { //TODO version compatibility check?
More information about the commits
mailing list