2006-12-29 [colin] 2.6.1cvs88

	* src/prefs_folder_item.c
		Fix bug 1085, 'Apply to subfolder
		doesn't work' - I was mistaken saying
		it worked in every case

diff --git a/ChangeLog b/ChangeLog
index d73b05506a05b5e79f576e3f6eb89793c263b20f..6f20e63a78ff7243bd93bea4400ecba0cca49274 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-29 [colin]     2.6.1cvs88
+
+       * src/prefs_folder_item.c
+               Fix bug 1085, 'Apply to subfolder 
+               doesn't work' - I was mistaken saying
+               it worked in every case
+
 2006-12-28 [colin]     2.6.1cvs87
 
        * src/gtk/gtkaspell.c

diff --git a/PATCHSETS b/PATCHSETS
index cb3c9ad4835bde4c86d87cdd02e2f381531e831f..d0de8d1348b7e08e2b2ce9932c57fbc54fe692b1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2195,3 +2195,4 @@
 ( cvs diff -u -r 1.24.2.18 -r 1.24.2.19 Makefile.am;  ) > 2.6.1cvs85.patchset
 ( cvs diff -u -r 1.24.2.19 -r 1.24.2.20 Makefile.am;  ) > 2.6.1cvs86.patchset
 ( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/gtk/gtkaspell.c;  ) > 2.6.1cvs87.patchset
+( cvs diff -u -r 1.52.2.31 -r 1.52.2.32 src/prefs_folder_item.c;  ) > 2.6.1cvs88.patchset

diff --git a/configure.ac b/configure.ac
index 10fe1c40341868a3478bd022bdc99dac851d0922..7a3e2a98314ef3ef56a1787199e80a28222cd598 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=87
+EXTRA_VERSION=88
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 7f1f18524049257daf1c3c7e2d92aab718dad270..61dc65cd775a5ab84796db9f147719f32ca1ec42 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -1002,8 +1002,7 @@ static gboolean compose_save_recurse_func(GNode *node, gpointer data)
 #endif
              gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_reply_to_rec_checkbtn))))
                return TRUE;
-
-       if ((node == page->item->node) &&
+       else if ((node == page->item->node) && item_protocol(item) == A_NNTP &&
            !(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_account_rec_checkbtn)) 
 #if USE_ASPELL
              || gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->default_dictionary_rec_checkbtn))