talons

commit b74c25ce7ab78131cd4e21b0fda9fd9041ae35b8
parent c29b5c9c76b048c3f1631ceb0134d2f5d6af85e8
Author: Michael Rasmussen <mir@datanom.net>
Date:   Mon,  8 Feb 2010 19:00:00 +0000

2010-02-08 [mir]	3.7.5cvs10

	* src/compose.c
	    Avoid displaying Bcc headers in message sent
	    to NNTP servers. Thanks to Henning Mersch.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
9
+++++++--

4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-08 [mir]	3.7.5cvs10
+
+	* src/compose.c
+	    Avoid displaying Bcc headers in message sent
+	    to NNTP servers. Thanks to Henning Mersch.
+
+
 2010-02-08 [pawel]	3.7.5cvs9
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3950,3 +3950,4 @@
 ( cvs diff -u -r 1.2.4.1 -r 1.2.4.2 m4/.cvsignore;  ) > 3.7.5cvs7.patchset
 ( cvs diff -u -r 1.382.2.541 -r 1.382.2.542 src/compose.c;  cvs diff -u -r 1.50.2.58 -r 1.50.2.59 src/compose.h;  cvs diff -u -r 1.36.2.182 -r 1.36.2.183 src/common/utils.c;  cvs diff -u -r 1.20.2.73 -r 1.20.2.74 src/common/utils.h;  cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/gtk/authors.h;  ) > 3.7.5cvs8.patchset
 ( cvs diff -u -r 1.83.2.158 -r 1.83.2.159 src/mimeview.c;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/gtk/description_window.c;  ) > 3.7.5cvs9.patchset
+( cvs diff -u -r 1.382.2.542 -r 1.382.2.543 src/compose.c;  ) > 3.7.5cvs10.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -6117,7 +6117,12 @@ static gchar *compose_get_header(Compose *compose)
 	compose_add_headerfield_from_headerlist(compose, header, "Cc", ", ");
 
 	/* Bcc */
-	compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
+	/* 
+	 * If this account is a NNTP account remove Bcc header from 
+	 * message body since it otherwise will be publicly shown
+	 */
+	if (compose->account->protocol != A_NNTP)
+		compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
 
 	/* Subject */
 	str = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
@@ -9251,7 +9256,7 @@ static void compose_allow_user_actions (Compose *compose, gboolean allow)
 static void compose_send_cb(GtkAction *action, gpointer data)
 {
 	Compose *compose = (Compose *)data;
-	
+
 	if (prefs_common.work_offline && 
 	    !inc_offline_should_override(TRUE,
 		_("Claws Mail needs network access in order "