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

List:       kde-commits
Subject:    KDE/kdepim/mailcommon
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-11-13 12:33:29
Message-ID: 20101113123329.69DC9AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1196426 by vkrause:

Get rid of the conflict detection workaround here, no longer needed with
the recent libakonadi changes and actually causes more harm than good.


 M  +1 -3      mdnadvicedialog.cpp  


--- trunk/KDE/kdepim/mailcommon/mdnadvicedialog.cpp #1196425:1196426
@@ -201,14 +201,12 @@
   }
 
   // create a minimal version of item with just the attribute we want to change
-  // so we can safely ignore any conflicts this might trigger, due to simulaneous
-  // flag changes for example.
   Akonadi::Item i( item.id() );
+  i.setRevision( item.revision() );
   i.setMimeType( item.mimeType() );
   i.addAttribute( mdnStateAttr );
   Akonadi::ItemModifyJob* modify = new Akonadi::ItemModifyJob( i );
   modify->setIgnorePayload( true );
-  modify->disableRevisionCheck();
 
   return QPair< bool, KMime::MDN::SendingMode >( doSend, s);
 }
[prev in list] [next in list] [prev in thread] [next in thread]