From 0fce4469085c4b13c2a70ba283bff1c802056db1 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 19 Sep 2010 12:45:15 +0200
Subject: [PATCH] * html_to_ascii appends a \n, we don't like that neither in
 our subjects nor in our senders.

---
 citadel/modules/rssclient/serv_rssclient.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index f59571db1..9a1a7688e 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -409,14 +409,21 @@ void rss_save_item(rss_item *ri)
 			StrBuf *EmailAddress;
 			StrBuf *EncBuf;
 			int FromAt;
+			int FromLen;
 			
 			UserName = NewStrBuf();
 			EmailAddress = NewStrBuf();
 			EncBuf = NewStrBuf();
 ////TODO!
+			StrBufTrim(ri->author_or_creator);
 			From = html_to_ascii(ChrPtr(ri->author_or_creator),
 					     StrLength(ri->author_or_creator), 
 					     512, 0);
+			FromLen = strlen(From);
+			if (From[FromLen - 1] == '\n')
+			{
+				From[FromLen - 1] = '\0';
+			}
 			FromAt = strchr(From, '@') != NULL;
 			if (!FromAt && StrLength (ri->author_email) > 0)
 			{
@@ -473,7 +480,13 @@ void rss_save_item(rss_item *ri)
 			StrBufSpaceToBlank(ri->title);
 			len = StrLength(ri->title);
 			Sbj = html_to_ascii(ChrPtr(ri->title), len, 512, 0);
-			Encoded = NewStrBufPlain(Sbj, -1);
+			len = strlen(Sbj);
+			if (Sbj[len - 1] == '\n')
+			{
+				len --;
+				Sbj[len] = '\0';
+			}
+			Encoded = NewStrBufPlain(Sbj, len);
 			free(Sbj);
 
 			StrBufTrim(Encoded);
-- 
2.39.2