rename our context so its more filename friendly.

[citadel.git] / citadel / modules / smtp / serv_smtpqueue.c

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 5979d6fc5fd28c845e9fa0f0110e46f7b0589962..369bc7276fea4adb26873d9fa8d7153f91119055 100644 (file)
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -117,8 +117,10 @@ int DecreaseQReference(OneQueItem *MyQItem)
 {
        int IDestructQueItem;
 
+       citthread_mutex_lock(&ActiveQItemsLock);
        MyQItem->ActiveDeliveries--;
        IDestructQueItem = MyQItem->ActiveDeliveries == 0;
+       citthread_mutex_unlock(&ActiveQItemsLock);
        return IDestructQueItem;
 }
 
@@ -205,7 +207,7 @@ OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
 
        citthread_mutex_lock(&ActiveQItemsLock);
        if (GetHash(ActiveQItems, 
-                   IKEY(Item->QueMsgID), 
+                   IKEY(QueMsgID), 
                    &v))
        {
                /* WHOOPS. somebody else is already working on this. */
@@ -800,7 +802,7 @@ void *smtp_queue_thread(void *arg) {
 
        CtdlThreadSleep(10);
 
-       CtdlFillSystemContext(&smtp_queue_CC, "SMTP Send");
+       CtdlFillSystemContext(&smtp_queue_CC, "SMTP_Send");
        citthread_setspecific(MyConKey, (void *)&smtp_queue_CC);
        CtdlLogPrintf(CTDL_DEBUG, "smtp_queue_thread() initializing\n");
 
@@ -897,7 +899,7 @@ CTDL_MODULE_INIT(smtp_queu)
 #ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
        if (!threading)
        {
-               ActiveQItems = NewHash(1, Flathash);
+               ActiveQItems = NewHash(1, lFlathash);
                citthread_mutex_init(&ActiveQItemsLock, NULL);
 
                QItemHandlers = NewHash(0, NULL);