Accidentally merged the configdb branch into master. Reverting.

[citadel.git] / citadel / modules / pop3client / serv_pop3client.c

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index bf235b2110899982ce502167499cd6d08f16a1e5..950436dd8ed65d5eaa4954b5cdbba915efc9af56 100644 (file)
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <sysconfig.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -432,8 +433,8 @@ eNextState POP3_FetchNetworkUsetableEntry(AsyncIO *IO)
 
                if (CheckIfAlreadySeen("POP3 Item Seen",
                                       RecvMsg->CurrMsg->MsgUID,
-                                      IO->Now,
-                                      IO->Now, //// todo
+                                      EvGetNow(IO),
+                                      EvGetNow(IO) - USETABLE_ANTIEXPIRE,
                                       eCheckUpdate,
                                       IO->ID, CCID)
                    != 0)
@@ -492,7 +493,8 @@ eNextState POP3C_GetOneMessagID(pop3aggr *RecvMsg)
                /// done receiving uidls.. start looking them up now.
                RecvMsg->Pos = GetNewHashPos(RecvMsg->MsgNumbers, 0);
                return EventQueueDBOperation(&RecvMsg->IO,
-                                            POP3_FetchNetworkUsetableEntry);
+                                            POP3_FetchNetworkUsetableEntry,
+                                            0);
        }
        return eReadMore; /* TODO */
 }
@@ -589,8 +591,8 @@ eNextState POP3C_StoreMsgRead(AsyncIO *IO)
                       ChrPtr(RecvMsg->CurrMsg->MsgUID));
        CheckIfAlreadySeen("POP3 Item Seen",
                           RecvMsg->CurrMsg->MsgUID,
-                          IO->Now,
-                          IO->Now, //// todo
+                          EvGetNow(IO),
+                          EvGetNow(IO) - USETABLE_ANTIEXPIRE,
                           eWrite,
                           IO->ID, CCID);
 
@@ -625,7 +627,7 @@ eNextState POP3C_ReadMessageBody(pop3aggr *RecvMsg)
        EVP3CM_syslog(LOG_DEBUG, "Converting message...");
        RecvMsg->CurrMsg->Msg =
                convert_internet_message_buf(&RecvMsg->IO.ReadMsg->MsgBuf);
-       return EventQueueDBOperation(&RecvMsg->IO, POP3C_SaveMsg);
+       return EventQueueDBOperation(&RecvMsg->IO, POP3C_SaveMsg, 0);
 }
 
 eNextState POP3C_SendDelete(pop3aggr *RecvMsg)