From: Art Cancro <ajc@citadel.org>
Date: Thu, 5 Jan 2006 22:39:07 +0000 (+0000)
Subject: Adjustments to journal recipient list
X-Git-Tag: v7.86~4346
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=914357f31b308e85d537803fef7514ab0f70a99f

Adjustments to journal recipient list
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 52da802a2..365a044d1 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Thu Jan  5 17:38:39 EST 2006 ajc
+* Adjustments to journal recipient list 
+
 Thu Jan  5 16:08:47 EST 2006 ajc
 * Implemented configuration settings for journaling.
 
diff --git a/citadel/journaling.c b/citadel/journaling.c
index b1af2b9c6..26af56e11 100644
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -159,27 +159,27 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
 				jmsg->msgn
 			);
 
-			if (journal_recps->num_local > 0) {
-				for (i=0; i<journal_recps->num_local; ++i) {
-					extract_token(recipient, journal_recps->recp_local,
+			if (jmsg->recps.num_local > 0) {
+				for (i=0; i<jmsg->recps.num_local; ++i) {
+					extract_token(recipient, jmsg->recps.recp_local,
 							i, '|', sizeof recipient);
 					sprintf(&message_text[strlen(message_text)],
 						"	%s\r\n", recipient);
 				}
 			}
 
-			if (journal_recps->num_ignet > 0) {
-				for (i=0; i<journal_recps->num_ignet; ++i) {
-					extract_token(recipient, journal_recps->recp_ignet,
+			if (jmsg->recps.num_ignet > 0) {
+				for (i=0; i<jmsg->recps.num_ignet; ++i) {
+					extract_token(recipient, jmsg->recps.recp_ignet,
 							i, '|', sizeof recipient);
 					sprintf(&message_text[strlen(message_text)],
 						"	%s\r\n", recipient);
 				}
 			}
 
-			if (journal_recps->num_internet > 0) {
-				for (i=0; i<journal_recps->num_internet; ++i) {
-					extract_token(recipient, journal_recps->recp_internet,
+			if (jmsg->recps.num_internet > 0) {
+				for (i=0; i<jmsg->recps.num_internet; ++i) {
+					extract_token(recipient, jmsg->recps.recp_internet,
 							i, '|', sizeof recipient);
 					sprintf(&message_text[strlen(message_text)],
 						"	%s\r\n", recipient);