summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-10-05 14:34:06 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-10-05 14:34:06 (GMT)
commit64f445b69b968c80b43f1b23d891458a7c66350a (patch)
tree850f1386d8beed9d269c38f5746be5b0d66ff11a
parenta5403604dc9e090a7bd9baf43da9475683354f88 (diff)
downloadkolab-utils-64f445b69b968c80b43f1b23d891458a7c66350a.tar.gz
Fixed drafts annotation
-rw-r--r--migrationutility/kolabaccount.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/migrationutility/kolabaccount.cpp b/migrationutility/kolabaccount.cpp
index 3924095..86eb78b 100644
--- a/migrationutility/kolabaccount.cpp
+++ b/migrationutility/kolabaccount.cpp
@@ -224,7 +224,7 @@ void KolabAccount::mailBoxesReceived(const QList<KIMAP::MailBoxDescriptor> &desc
}
//TODO move to formathelpers.h or kolabdefinitions.h
-#define KOLAB_FOLDER_TYPE_DRAFT_SUFFIX ".draft"
+#define KOLAB_FOLDER_TYPE_DRAFTS_SUFFIX ".drafts"
#define KOLAB_FOLDER_TYPE_SENT_SUFFIX ".sentitems"
#define KOLAB_FOLDER_TYPE_OUTBOX_SUFFIX ".outbox"
#define KOLAB_FOLDER_TYPE_TRASH_SUFFIX ".wastebasket"
@@ -281,7 +281,7 @@ void KolabAccount::setupFolders()
return;
}
SetupKolabFoldersJob *setupJob = new SetupKolabFoldersJob(mCapabilities, QString(), mSession, this);
- setupJob->setKolabFolders(QStringList() << KOLAB_FOLDER_TYPE_CONTACT << KOLAB_FOLDER_TYPE_EVENT << KOLAB_FOLDER_TYPE_TASK << KOLAB_FOLDER_TYPE_JOURNAL << KOLAB_FOLDER_TYPE_NOTE << KOLAB_FOLDER_TYPE_CONFIGURATION);
+ setupJob->setKolabFolders(QStringList() << KOLAB_FOLDER_TYPE_CONTACT << KOLAB_FOLDER_TYPE_EVENT << KOLAB_FOLDER_TYPE_TASK << KOLAB_FOLDER_TYPE_JOURNAL << KOLAB_FOLDER_TYPE_NOTE);
setupJob->exec();
if (setupJob->error()) {
Error() << setupJob->errorString();
@@ -292,7 +292,9 @@ void KolabAccount::setupFolders()
KIMAP::SelectJob *selectJob = new KIMAP::SelectJob(mSession);
selectJob->setMailBox(QString());
//TODO internationalize folder names
- createFolder("Drafts", KOLAB_FOLDER_TYPE_MAIL KOLAB_FOLDER_TYPE_DRAFT_SUFFIX);
+ //TODO make part of setupkolabfoldersjob after adding types to folderTypeFromString in formathelpers.cpp
+ createFolder("Configuration", KOLAB_FOLDER_TYPE_CONFIGURATION KOLAB_FOLDER_TYPE_DEFAULT_SUFFIX);
+ createFolder("Drafts", KOLAB_FOLDER_TYPE_MAIL KOLAB_FOLDER_TYPE_DRAFTS_SUFFIX);
createFolder("Sent", KOLAB_FOLDER_TYPE_MAIL KOLAB_FOLDER_TYPE_SENT_SUFFIX);
createFolder("Trash", KOLAB_FOLDER_TYPE_MAIL KOLAB_FOLDER_TYPE_TRASH_SUFFIX);
}