2006-07-07 [colin] 2.3.1cvs69

	* src/folder.c
		Don't consider inboxes of UNKNOWN folder
		classes to be useable as default inboxes

diff --git a/ChangeLog b/ChangeLog
index 868fa9c286ca654fc820dd514828ee9572d02fa6..b09b57eef5996fd5cef23724134443cf4e055232 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-07 [colin]     2.3.1cvs69
+
+       * src/folder.c
+               Don't consider inboxes of UNKNOWN folder 
+               classes to be useable as default inboxes
+
 2006-07-07 [paul]      2.3.1cvs68
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 9c3852b902151ce62839e723b1eb5449bd09e923..e99112edd08e0b216e828fe4aba67088efed5135 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1669,3 +1669,4 @@
 ( cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/remotefolder.h;  ) > 2.3.1cvs66.patchset
 ( cvs diff -u -r 1.12.2.35 -r 1.12.2.36 src/action.c;  cvs diff -u -r 1.83.2.75 -r 1.83.2.76 src/mimeview.c;  cvs diff -u -r 1.20.2.10 -r 1.20.2.11 src/mimeview.h;  cvs diff -u -r 1.96.2.123 -r 1.96.2.124 src/textview.c;  cvs diff -u -r 1.36.2.71 -r 1.36.2.72 src/common/utils.c;  ) > 2.3.1cvs67.patchset
 ( cvs diff -u -r 1.96.2.124 -r 1.96.2.125 src/textview.c;  ) > 2.3.1cvs68.patchset
+( cvs diff -u -r 1.213.2.104 -r 1.213.2.105 src/folder.c;  ) > 2.3.1cvs69.patchset

diff --git a/configure.ac b/configure.ac
index 9832afe3cddb37ebd934d5192c350d728cfb795a..bd386d87cf8d6080b8e65fbe2a57bb25db362eae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index acdb51ac5e83e644a70f604e63927e87eb6c9085..fb8e8f6bdc7c250ad25ed2abdb78c639db2a92f9 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1346,6 +1346,8 @@ FolderItem *folder_get_default_inbox(void)
                        continue;
                if (folder->inbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->inbox;
        }