[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-runtime/KDE/4.12] resources/imap: Merge branch '4.11' into 4.12
From:       Christian Mollekopf <chrigi_1 () fastmail ! fm>
Date:       2013-11-06 14:38:35
Message-ID: E1Ve4Ff-0006Gp-EH () scm ! kde ! org
[Download RAW message or body]

Git commit 1181929404f3ed7b39905aff290cbf7af584da9e by Christian Mollekopf.
Committed on 06/11/2013 at 14:38.
Pushed by cmollekopf into branch 'KDE/4.12'.

Merge branch '4.11' into 4.12

Conflicts:
	resources/kolabproxy/tests/CMakeLists.txt

M  +6    -6    resources/imap/addcollectiontask.cpp
M  +8    -8    resources/imap/changecollectiontask.cpp
M  +14   -2    resources/imap/retrievecollectionmetadatatask.cpp

http://commits.kde.org/kdepim-runtime/1181929404f3ed7b39905aff290cbf7af584da9e

diff --cc resources/imap/retrievecollectionmetadatatask.cpp
index 9725eec,10a7c7d..7b58ae4
--- a/resources/imap/retrievecollectionmetadatatask.cpp
+++ b/resources/imap/retrievecollectionmetadatatask.cpp
@@@ -101,12 -101,13 +101,13 @@@ void RetrieveCollectionMetadataTask::do
    m_pendingMetaDataJobs = 0;
  
    // First get the annotations from the mailbox if it's supported
 -  if ( capabilities.contains( "METADATA" ) || capabilities.contains( "ANNOTATEMORE" \
) ) {  +  if ( capabilities.contains( QLatin1String("METADATA") ) || \
capabilities.contains( QLatin1String("ANNOTATEMORE") ) ) {  KIMAP::GetMetaDataJob \
*meta = new KIMAP::GetMetaDataJob( session );  meta->setMailBox( mailBox );
 -    if ( capabilities.contains( "METADATA" ) ) {
 +    if ( capabilities.contains( QLatin1String("METADATA") ) ) {
        meta->setServerCapability( KIMAP::MetaDataJobBase::Metadata );
-       meta->addEntry( "*" );
+       meta->addEntry( "/shared" );
+       meta->setDepth( KIMAP::GetMetaDataJob::AllLevels );
      } else {
        meta->setServerCapability( KIMAP::MetaDataJobBase::Annotatemore );
        meta->addEntry( "*", "value.shared" );


[prev in list] [next in list] [prev in thread] [next in thread]