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

List:       kde-commits
Subject:    [kdepim-runtime/KDE/4.11] resources/imap: Convert the Akonadi flags to IMAP flags in ChangeItemsFlag
From:       Andre Woebbeking <Woebbeking () kde ! org>
Date:       2013-09-13 12:26:43
Message-ID: E1VKSSR-0006TJ-9r () scm ! kde ! org
[Download RAW message or body]

Git commit 658056eef812eeebb8b3d995378e178b0ae3c9e6 by Andre Woebbeking.
Committed on 13/09/2013 at 12:21.
Pushed by woebbe into branch 'KDE/4.11'.

Convert the Akonadi flags to IMAP flags in ChangeItemsFlagsTask like it's done in \
ChangeItemTask and handle Akonadi::MessageFlags::Replied in \
ResourceTask::fromAkonadiFlags().

BUG:291332
FIXED-IN: 4.11.2
REVIEW:112482

M  +2    -2    resources/imap/changeitemsflagstask.cpp
M  +1    -1    resources/imap/resourcetask.cpp

http://commits.kde.org/kdepim-runtime/658056eef812eeebb8b3d995378e178b0ae3c9e6

diff --git a/resources/imap/changeitemsflagstask.cpp \
b/resources/imap/changeitemsflagstask.cpp index f91d6e7..1c7f415 100644
--- a/resources/imap/changeitemsflagstask.cpp
+++ b/resources/imap/changeitemsflagstask.cpp
@@ -91,7 +91,7 @@ KIMAP::StoreJob* ChangeItemsFlagsTask::prepareJob( KIMAP::Session \
*session )  void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session* session)
 {
   KIMAP::StoreJob *store = prepareJob( session );
-  store->setFlags( addedFlags().toList() );
+  store->setFlags( fromAkonadiFlags( addedFlags().toList() ) );
   store->setMode( KIMAP::StoreJob::AppendFlags );
   connect( store, SIGNAL(result(KJob*)), SLOT(onAppendFlagsDone(KJob*)) );
   store->start();
@@ -100,7 +100,7 @@ void ChangeItemsFlagsTask::triggerAppendFlagsJob(KIMAP::Session* \
session)  void ChangeItemsFlagsTask::triggerRemoveFlagsJob(KIMAP::Session* session)
 {
   KIMAP::StoreJob *store = prepareJob( session );
-  store->setFlags( removedFlags().toList() );
+  store->setFlags( fromAkonadiFlags( removedFlags().toList() ) );
   store->setMode( KIMAP::StoreJob::RemoveFlags );
   connect( store, SIGNAL(result(KJob*)), SLOT(onRemoveFlagsDone(KJob*)) );
   store->start();
diff --git a/resources/imap/resourcetask.cpp b/resources/imap/resourcetask.cpp
index 599681c..30f93be 100644
--- a/resources/imap/resourcetask.cpp
+++ b/resources/imap/resourcetask.cpp
@@ -356,7 +356,7 @@ QList<QByteArray> ResourceTask::fromAkonadiFlags( const \
QList<QByteArray> &flags  newFlags.append( ImapFlags::Seen );
     } else if ( oldFlag == Akonadi::MessageFlags::Deleted ) {
       newFlags.append( ImapFlags::Deleted );
-    } else if ( oldFlag == Akonadi::MessageFlags::Answered ) {
+    } else if ( oldFlag == Akonadi::MessageFlags::Answered || oldFlag == \
Akonadi::MessageFlags::Replied ) {  newFlags.append( ImapFlags::Answered );
     } else if ( oldFlag == Akonadi::MessageFlags::Flagged ) {
       newFlags.append( ImapFlags::Flagged );


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