2006-09-03 [colin] 2.4.0cvs137

	* src/compose.c
		Don't set Newsgroup: header to a mail folder
		path

diff --git a/ChangeLog b/ChangeLog
index 18454beb0a9316473b1c849f9aa27d5af5450255..ba8c788b380556c664cdb890a1795c7785bba42f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-03 [colin]     2.4.0cvs137
+
+       * src/compose.c
+               Don't set Newsgroup: header to a mail folder
+               path
+
 2006-09-03 [paul]      2.4.0cvs136
 
        * src/prefs_other.c

diff --git a/PATCHSETS b/PATCHSETS
index fed70cbc7a66956511b2a1c6ea8a99da13484374..ca432e17a6a0c3c6e3eb6ec35205b503e077e397 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1828,3 +1828,4 @@
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 manual/advanced.xml;  cvs diff -u -r 1.274.2.146 -r 1.274.2.147 src/mainwindow.c;  cvs diff -u -r 1.94.2.101 -r 1.94.2.102 src/messageview.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_message.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_other.c;  cvs diff -u -r 1.395.2.241 -r 1.395.2.242 src/summaryview.c;  cvs diff -u -r 1.96.2.143 -r 1.96.2.144 src/textview.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/menu.c;  ) > 2.4.0cvs134.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_summaries.c;  ) > 2.4.0cvs135.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_other.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/prefs_spelling.c;  ) > 2.4.0cvs136.patchset
+( cvs diff -u -r 1.382.2.305 -r 1.382.2.306 src/compose.c;  ) > 2.4.0cvs137.patchset

diff --git a/configure.ac b/configure.ac
index bb27dae934c69f4deec53b71e81efa9fbf94e6d8..9be92d7a610c914c81c5083bc332fc38c5518beb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=136
+EXTRA_VERSION=137
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index a9cb7194bc0e21bb7ce786818d24077d93eb2e1c..6312da9442d981906fa6782f44ef1b549a6776de 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -982,7 +982,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        } else {
                if (mailto) {
                        compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
-               } else if (item) {
+               } else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
                        compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
                }
                /*