summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2014-03-24 10:11:15 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2014-03-24 10:11:15 (GMT)
commitc12b60228acb4c7ed67dbdbcf68031704c16b9ab (patch)
tree1e25101c8663844b9c208abad5cdb516aad68147
parenta6748c64c7d8989020024d76f81e9fed77fa661d (diff)
downloadlibkolab-c12b60228acb4c7ed67dbdbcf68031704c16b9ab.tar.gz
Use the correct X-Kolab-Type according to KEP:17
-rw-r--r--kolabformat/kolabdefinitions.h4
-rw-r--r--kolabformat/kolabobject.cpp2
-rw-r--r--kolabformat/v2helpers.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/kolabformat/kolabdefinitions.h b/kolabformat/kolabdefinitions.h
index 6bde0c2..379648c 100644
--- a/kolabformat/kolabdefinitions.h
+++ b/kolabformat/kolabdefinitions.h
@@ -56,8 +56,8 @@ namespace Kolab {
#define KOLAB_TYPE_TASK "application/x-vnd.kolab.task"
#define KOLAB_TYPE_JOURNAL "application/x-vnd.kolab.journal"
#define KOLAB_TYPE_CONTACT "application/x-vnd.kolab.contact"
-#define KOLAB_TYPE_DISTLIST "application/x-vnd.kolab.contact.distlist"
-#define KOLAB_TYPE_DISTLIST_COMPAT "application/x-vnd.kolab.distribution-list"
+#define KOLAB_TYPE_DISTLIST_V2 "application/x-vnd.kolab.contact.distlist"
+#define KOLAB_TYPE_DISTLIST "application/x-vnd.kolab.distribution-list"
#define KOLAB_TYPE_NOTE "application/x-vnd.kolab.note"
#define KOLAB_TYPE_CONFIGURATION "application/x-vnd.kolab.configuration"
#define KOLAB_TYPE_DICT "application/x-vnd.kolab.configuration.dictionary"
diff --git a/kolabformat/kolabobject.cpp b/kolabformat/kolabobject.cpp
index c5ff391..b894818 100644
--- a/kolabformat/kolabobject.cpp
+++ b/kolabformat/kolabobject.cpp
@@ -46,7 +46,7 @@ static inline QString todoKolabType() { return QString::fromLatin1(KOLAB_TYPE_TA
static inline QString journalKolabType() { return QString::fromLatin1(KOLAB_TYPE_JOURNAL); };
static inline QString contactKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONTACT); };
static inline QString distlistKolabType() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST); }
-static inline QString distlistKolabTypeCompat() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST_COMPAT); }
+static inline QString distlistKolabTypeCompat() { return QString::fromLatin1(KOLAB_TYPE_DISTLIST_V2); }
static inline QString noteKolabType() { return QString::fromLatin1(KOLAB_TYPE_NOTE); }
static inline QString configurationKolabType() { return QString::fromLatin1(KOLAB_TYPE_CONFIGURATION); }
static inline QString dictKolabType() { return QString::fromLatin1(KOLAB_TYPE_DICT); }
diff --git a/kolabformat/v2helpers.cpp b/kolabformat/v2helpers.cpp
index 0f891cc..03b4b19 100644
--- a/kolabformat/v2helpers.cpp
+++ b/kolabformat/v2helpers.cpp
@@ -192,7 +192,7 @@ KABC::ContactGroup contactGroupFromKolab(const QByteArray &xmlData)
KMime::Message::Ptr distListToKolabFormat(const KolabV2::DistributionList& distList, const QString &productId)
{
- KMime::Message::Ptr message = Mime::createMessage( KOLAB_TYPE_DISTLIST, false, productId );
+ KMime::Message::Ptr message = Mime::createMessage( KOLAB_TYPE_DISTLIST_V2, false, productId );
if (!message) {
Critical() << "empty message";
return KMime::Message::Ptr();
@@ -200,7 +200,7 @@ KMime::Message::Ptr distListToKolabFormat(const KolabV2::DistributionList& distL
message->subject()->fromUnicodeString( distList.uid(), "utf-8" );
message->from()->fromUnicodeString( distList.uid(), "utf-8" );
- KMime::Content* content = Mime::createMainPart( KOLAB_TYPE_DISTLIST, distList.saveXML().toUtf8() );
+ KMime::Content* content = Mime::createMainPart( KOLAB_TYPE_DISTLIST_V2, distList.saveXML().toUtf8() );
message->addContent( content );
message->assemble();