::sync on client before removing mail from external POP server.

Only for POP accounts and only when the configuration option delete mail from
server when retrieved by client is enabled.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index b073b5fa..758ffc95 100644
--- a/src/plugins/messageservices/pop/popclient.cpp
+++ b/src/plugins/messageservices/pop/popclient.cpp
@@ -50,8 +50,10 @@
 #include <qmailtransport.h>
 #include <qmaillog.h>
 #include <qmaildisconnected.h>
-
 #include <limits.h>
+#if !defined(Q_OS_WIN) && !defined(Q_OS_SYMBIAN)
+#include <unistd.h>
+#endif
 
 
 class MessageFlushedWrapper : public QMailMessageBufferFlushCallback
@@ -753,7 +755,14 @@ void PopClient::nextAction()
     {
         PopConfiguration popCfg(config);
         if (popCfg.deleteRetrievedMailsFromServer()) {
-        int pos = msgPosFromUidl(messageUid);
+            // Now that sqlite WAL is used, make sure mail metadata is sync'd 
+            // on device before removing from external mail server
+#if defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN)
+            qWarning() << "Unable to call sync in POP plugin.";
+#else
+            ::sync();
+#endif
+            int pos = msgPosFromUidl(messageUid);
             emit updateStatus(tr("Removing message from server"));
             nextCommand = ("DELE " + QString::number(pos));
             nextStatus = DeleAfterRetr;