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

List:       kde-commits
Subject:    KDE/kdepim
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-12-09 14:08:36
Message-ID: 20101209140836.9173CAC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204897 by tokoe:

The message is marked as replied/forwarded automatically by
the maildispatcher now, so no need to mark it in advance.

BUG: 258366


 M  +0 -66     kmail/kmcommands.cpp  
 M  +0 -10     mobile/mail/mainview.cpp  


--- trunk/KDE/kdepim/kmail/kmcommands.cpp #1204896:1204897
@@ -459,10 +459,6 @@
   win->setReplyFocus();
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -491,10 +487,6 @@
   KMail::Composer * win = KMail::makeComposer( fmsg, KMail::Composer::Forward );
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Forwarded );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -838,10 +830,6 @@
   win->setReplyFocus();
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -870,10 +858,6 @@
   win->setReplyFocus( false );
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -906,10 +890,6 @@
   win->setReplyFocus( false );
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -943,10 +923,6 @@
   win->setReplyFocus();
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -979,10 +955,6 @@
   win->setReplyFocus();
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -1035,12 +1007,6 @@
           win->show();
         }
 
-        foreach( Akonadi::Item item, msgList ) {
-          item.setFlag( Akonadi::MessageFlags::Forwarded );
-          Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-          job->setIgnorePayload( true );
-        }
-
       return OK;
     } else if ( answer == KMessageBox::No ) {// NO MIME DIGEST, Multiple forward
       QList<Akonadi::Item>::const_iterator it;
@@ -1061,11 +1027,6 @@
         {
           KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::Forward, id );
           win->show();
-
-          Akonadi::Item item( *it );
-          item.setFlag( Akonadi::MessageFlags::Forwarded );
-          Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-          job->setIgnorePayload( true );
         }
 
       }
@@ -1093,10 +1054,6 @@
   {
     KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::Forward, id );
     win->show();
-
-    item.setFlag( Akonadi::MessageFlags::Forwarded );
-    Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-    job->setIgnorePayload( true );
   }
   return OK;
 }
@@ -1140,12 +1097,6 @@
     mWin->show();
   }
 
-  foreach( Akonadi::Item item, msgList ) {
-    item.setFlag( Akonadi::MessageFlags::Forwarded );
-    Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-    job->setIgnorePayload( true );
-  }
-
   mWin->show();
   return OK;
 }
@@ -1228,10 +1179,6 @@
   win->setReplyFocus();
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -1266,10 +1213,6 @@
   win->setReplyFocus();
   win->show();
 
-  item.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-  job->setIgnorePayload( true );
-
   return OK;
 }
 
@@ -1315,11 +1258,6 @@
         {
           KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::Forward, id );
           win->show();
-
-          Akonadi::Item item( *it );
-          item.setFlag( Akonadi::MessageFlags::Forwarded );
-          Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-          job->setIgnorePayload( true );
         }
 
       }
@@ -1346,10 +1284,6 @@
       KMail::Composer * win = KMail::makeComposer( fwdMsg, KMail::Composer::Forward, id,
                                                    QString(), mTemplate );
       win->show();
-
-      item.setFlag( Akonadi::MessageFlags::Forwarded );
-      Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob( item );
-      job->setIgnorePayload( true );
     }
   }
   return OK;
--- trunk/KDE/kdepim/mobile/mail/mainview.cpp #1204896:1204897
@@ -742,11 +742,6 @@
   composer->show();
 
   presetComposerIdentity( composer );
-
-  Item statusItem( item );
-  statusItem.setFlag( Akonadi::MessageFlags::Replied );
-  Akonadi::ItemModifyJob *modifyJob = new Akonadi::ItemModifyJob( statusItem );
-  modifyJob->setIgnorePayload( true );
 }
 
 void MainView::forward( quint64 id, ForwardMode mode )
@@ -791,11 +786,6 @@
 
   composer->show();
   presetComposerIdentity( composer );
-
-  Item statusItem( item );
-  statusItem.setFlag( Akonadi::MessageFlags::Forwarded );
-  Akonadi::ItemModifyJob *modifyJob = new Akonadi::ItemModifyJob( statusItem );
-  modifyJob->setIgnorePayload( true );
 }
 
 void MainView::markImportant( bool checked )
[prev in list] [next in list] [prev in thread] [next in thread]