talons

commit 50d6548a6759157f44d4a83f69e692df71876d83
parent 38e2d26c578bb64c6c2cb402d5dae43f401bedb9
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat, 17 Jan 2009 08:46:20 +0000

2009-01-17 [paul]	3.7.0cvs35

	* src/prefs_folder_item.c
		fix bug where saving General Folder Properties
		of a sub-folder of outbox, queue, draft or trash
		would change its parent's folder type to normal

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

4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-17 [paul]	3.7.0cvs35
+
+	* src/prefs_folder_item.c
+		fix bug where saving General Folder Properties
+		of a sub-folder of outbox, queue, draft or trash
+		would change its parent's folder type to normal
+
 2009-01-12 [mones]	3.7.0cvs34
 
 	* po/es.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -3696,3 +3696,4 @@
 ( cvs diff -u -r 1.28.2.40 -r 1.28.2.41 src/addrindex.c;  ) > 3.7.0cvs32.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 tools/fix_date.sh;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/popfile-link.sh;  cvs diff -u -r 1.4.2.4 -r 1.4.2.5 tools/textviewer.sh;  ) > 3.7.0cvs33.patchset
 ( cvs diff -u -r 1.60.2.55 -r 1.60.2.56 po/es.po;  ) > 3.7.0cvs34.patchset
+( cvs diff -u -r 1.52.2.72 -r 1.52.2.73 src/prefs_folder_item.c;  ) > 3.7.0cvs35.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -633,7 +633,7 @@ static void general_save_folder_prefs(FolderItem *folder, FolderItemGeneralPage 
 		all = TRUE;
 
 	type = combobox_get_active_data(GTK_COMBO_BOX(page->folder_type));
-	if (all && folder->stype != type) {
+	if (all && folder->stype != type && page->item->parent_stype == F_NORMAL) {
 		folder_item_change_type(folder, type);
 	}