From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 5 Sep 2011 08:50:40 +0000 (+0000)
Subject: more tiny merge misses
X-Git-Tag: v8.11~496
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=42efcdda20499cbaf04294ed41ff1699465849ee

more tiny merge misses
---

diff --git a/citadel/context.c b/citadel/context.c
index 181d0347c..cf8309e01 100644
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -588,7 +588,7 @@ void context_cleanup(void)
 		rem = ptr->next;
 		--num_sessions;
 
-		syslog(LOG_DEBUG, "context_cleanup(): Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
+		syslog(LOG_DEBUG, "context_cleanup(): purging session %d\n", ptr->cs_pid);
 		RemoveContext(ptr);
 		free (ptr);
 		ptr = rem;
diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 9115b1fb4..7506a1abf 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -743,16 +743,20 @@ void network_spool_msg(long msgnum, void *userdata) {
 
 			/* else we won't modify the buffer, since the roomname is already here. */
 
-			/* if we don't already have a 'reply to' field, put our roomname in. */
-			if (msg->cm_fields['K'] == NULL) {
-				msg->cm_fields['K'] = malloc(256);
-				snprintf(msg->cm_fields['K'], 256,
-					 "room_%s@%s", CC->room.QRname,
-					 config.c_fqdn);
-				for (i=0; msg->cm_fields['K'][i]; ++i) {
-					if (isspace(msg->cm_fields['K'][i])) {
-						msg->cm_fields['K'][i] = '_';
-					}
+			/* Set the recipient of the list message to the
+			 * email address of the room itself.
+			 * FIXME ... I want to be able to pick any address
+			 */
+			if (msg->cm_fields['R'] != NULL) {
+				free(msg->cm_fields['R']);
+			}
+			msg->cm_fields['R'] = malloc(256);
+			snprintf(msg->cm_fields['R'], 256,
+				"room_%s@%s", CC->room.QRname,
+				config.c_fqdn);
+			for (i=0; msg->cm_fields['R'][i]; ++i) {
+				if (isspace(msg->cm_fields['R'][i])) {
+					msg->cm_fields['R'][i] = '_';
 				}
 			}
 
diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index e18ebd024..cec2f9bd0 100644
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -1001,9 +1001,8 @@ CTDL_MODULE_INIT(smtp_client)
 		CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
 		CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
 	}
-	
 #endif
-	/* return our Subversion id for the Log */
-	return "smtpclient";
+	/* return our module name for the log */
+	return "smtp";
 }
 
diff --git a/citadel/po/citadel-setup/fr.po b/citadel/po/citadel-setup/fr.po
index bab3fd8a4..c8b858003 100644
--- a/citadel/po/citadel-setup/fr.po
+++ b/citadel/po/citadel-setup/fr.po
@@ -43,7 +43,7 @@ msgid ""
 "a default installation just leave it blank.If you specify a directory other "
 "than the default, you will need to\n"
 "specify the -h flag to the server when you start it up.\n"
-"note that it may not have a leading /\n"
+"note that it may not have a leading /"
 msgstr ""
 "Entrez le chemin complet du répertoire dans lequel se trouve\n"
 "l'installation de Citadel que vous créez ou mettez à jour. Si vous\n"