fixed separator of newsgroups.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@739 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 24 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 683ddf2c..9ce7faae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-11-11
 
+	* src/compose.c: fixed separator of newsgroups (thanks to KAZUKI
+	  SHIMURA).
+	  compose_reedit_set_entry(): also set Newsgroups and Followup-To
+	  entry.
+
+2005-11-11
+
 	* src/main.c: app_init(): win32: disable digit locale variable such as
 	  "LANG=1041".
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 8b9a7780..c4c3f506 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
 2005-11-11
 
+	* src/compose.c: ニュースグループのセパレータを修正(志村さん thanks)。
+	  compose_reedit_set_entry(): Newsgroups と Followup-To エントリも
+	  セットするようにした。
+
+2005-11-11
+
 	* src/main.c: app_init(): win32: "LANG=1041" のよな数値のロケール
 	  変数を無効にした。
 
diff --git a/src/compose.c b/src/compose.c
index 7989fdd1..c805d77e 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1606,11 +1606,18 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 static void compose_reedit_set_entry(Compose *compose, MsgInfo *msginfo)
 {
 	g_return_if_fail(msginfo != NULL);
+	g_return_if_fail(compose->account != NULL);
 
 	compose_entry_set(compose, msginfo->to     , COMPOSE_ENTRY_TO);
 	compose_entry_set(compose, compose->cc     , COMPOSE_ENTRY_CC);
 	compose_entry_set(compose, compose->bcc    , COMPOSE_ENTRY_BCC);
 	compose_entry_set(compose, compose->replyto, COMPOSE_ENTRY_REPLY_TO);
+	if (compose->account->protocol == A_NNTP) {
+		compose_entry_set(compose, compose->newsgroups,
+				  COMPOSE_ENTRY_NEWSGROUPS);
+		compose_entry_set(compose, compose->followup_to,
+				  COMPOSE_ENTRY_FOLLOWUP_TO);
+	}
 	compose_entry_set(compose, msginfo->subject, COMPOSE_ENTRY_SUBJECT);
 }
 
@@ -3504,7 +3511,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
 				compose_convert_header(compose,
 						       buf, sizeof(buf), str,
 						       strlen("Newsgroups: "),
-						       TRUE, charset);
+						       FALSE, charset);
 				fprintf(fp, "Newsgroups: %s\n", buf);
 			}
 		}
@@ -3565,7 +3572,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
 				compose_convert_header(compose,
 						       buf, sizeof(buf), str,
 						       strlen("Followup-To: "),
-						       TRUE, charset);
+						       FALSE, charset);
 				fprintf(fp, "Followup-To: %s\n", buf);
 			}
 		}
@@ -3733,7 +3740,7 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
 				compose_convert_header(compose,
 						       buf, sizeof(buf), str,
 						       strlen("Newsgroups: "),
-						       TRUE, NULL);
+						       FALSE, NULL);
 				fprintf(fp, "Newsgroups: %s\n", buf);
 			}
 		}
@@ -3774,7 +3781,7 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
 				compose_convert_header(compose,
 						       buf, sizeof(buf), str,
 						       strlen("Followup-To: "),
-						       TRUE, NULL);
+						       FALSE, NULL);
 				fprintf(fp, "Followup-To: %s\n", buf);
 			}
 		}