Reverted my work on the 'originated locally' field. I found a much simpler way to...

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 7e6d0650e473f0664d2f1d33d6feb30f789f90af..8ebb91911d23086cb8cc1e6c343bcbda1e0bdd5f 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -61,7 +61,7 @@ char *msgkeys[] = {
        "rep2", // K -> eReplyTo
        "list", // L -> eListID
        "text", // M -> eMesageText
-       NULL,   // N (formerly used as eNodeName)
+       NULL,   // N (formerly used as eNodename)
        "room", // O -> eOriginalRoom
        "path", // P -> eMessagePath
        NULL,   // Q
@@ -2657,8 +2657,7 @@ void ReplicationChecks(struct CtdlMessage *msg) {
  */
 long CtdlSubmitMsg(struct CtdlMessage *msg,    /* message to save */
                   recptypes *recps,            /* recipients (if mail) */
-                  const char *force,           /* force a particular room? */
-                  int flags                    /* should the message be exported clean? */
+                  const char *force            /* force a particular room? */
 ) {
        char hold_rm[ROOMNAMELEN];
        char actual_rm[ROOMNAMELEN];
@@ -3020,7 +3019,7 @@ long quickie_message(const char *from,
                CM_SetField(msg, eMesageText, text, -1);
        }
 
-       long msgnum = CtdlSubmitMsg(msg, recp, room, 0);
+       long msgnum = CtdlSubmitMsg(msg, recp, room);
        CM_Free(msg);
        if (recp != NULL) free_recipients(recp);
        return msgnum;
@@ -3610,7 +3609,7 @@ void CtdlWriteObject(char *req_room,                      /* Room to stuff it in */
                        );
        }
        /* Now write the data */
-       CtdlSubmitMsg(msg, NULL, roomname, 0);
+       CtdlSubmitMsg(msg, NULL, roomname);
        CM_Free(msg);
 }