summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2013-11-03 18:25:41 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2013-11-14 09:23:07 (GMT)
commitcb014dcb9154a1ec266e2145864a3099864eddbf (patch)
tree94180d77907fb3e4a13d26738921cc245acc92e7
parentcb4c8282b22e9f7cff3323959307d936ef2d6535 (diff)
downloadkolab-utils-cb014dcb9154a1ec266e2145864a3099864eddbf.tar.gz
Print a warning if annotations are not supported and stop job.
(cherry picked from commit 772c37044f98066aef9d37d93c23870c2a54d297)
-rw-r--r--lib/jobs/findkolabfoldersjob.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/jobs/findkolabfoldersjob.cpp b/lib/jobs/findkolabfoldersjob.cpp
index ce3bdf6..cda3ca5 100644
--- a/lib/jobs/findkolabfoldersjob.cpp
+++ b/lib/jobs/findkolabfoldersjob.cpp
@@ -83,9 +83,13 @@ void FindKolabFoldersJob::onMailBoxesReceived( const QList< KIMAP::MailBoxDescri
if ( m_serverCapabilities.contains( "METADATA" ) ) {
meta->setServerCapability( KIMAP::MetaDataJobBase::Metadata );
meta->addEntry( KOLAB_FOLDER_TYPE_ANNOTATION );
- } else {
+ } else if ( m_serverCapabilities.contains( "ANNOTATEMORE" ) ) {
meta->setServerCapability( KIMAP::MetaDataJobBase::Annotatemore );
meta->addEntry( KOLAB_FOLDER_TYPE_ANNOTATION, "value.shared" );
+ } else {
+ Warning() << "Server does not support annotations";
+ emitResult();
+ return;
}
connect( meta, SIGNAL(result(KJob*)), SLOT(onGetMetaDataDone(KJob*)) );
m_metadataRetrieveJobs++;