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

diff --git a/ChangeLog b/ChangeLog
index b9bdc184ef88cf06fc4c11f1f9fffa13e25b084a..ce986b59cc191a58d0f9d3a09df59372992641c3 100644 (file)
--- 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
 2009-01-12 [mones]     3.7.0cvs34
 
        * po/es.po

diff --git a/PATCHSETS b/PATCHSETS
index ce84321bbac268efc8daeb95e8a87ba01eaa3501..577c6a10872da334f68a381493efdc39c83cfbd3 100644 (file)
--- 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.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
index 48a203c8bfc11c68087f0eee2b4e1a7a8bfbfdf4..cd84a005b946982d95de49f776a72ea91bf416b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=34
+EXTRA_VERSION=35

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 18e2fe3aa791a8cc18f97741f205bc03daa75fb2..9e237f6b7ddab9d99a76ecaaa5245891b120a1b0 100644 (file)
--- 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));
                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);
        }
 
                folder_item_change_type(folder, type);
        }