2006-12-11 [colin] 2.6.1cvs15

	* src/prefs_account.c
		Prevent use of non-existing default inbox

diff --git a/ChangeLog b/ChangeLog
index 8ce00663d104128c2f593d587932226cafb2f253..675e95a83bc7f46283c52991828544f94bae6242 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-11 [colin]     2.6.1cvs15
+
+       * src/prefs_account.c
+               Prevent use of non-existing default inbox
+
 2006-12-11 [colin]     2.6.1cvs14
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index 0170f55e82489d64e385e4cf496a120f3456852a..7cdcfeb2f09a764578b3c299583e2e041a03f5ba 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2122,3 +2122,4 @@
 ( cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/action.c;  ) > 2.6.1cvs12.patchset
 ( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 manual/advanced.xml;  cvs diff -u -r 1.204.2.111 -r 1.204.2.112 src/prefs_common.c;  cvs diff -u -r 1.103.2.69 -r 1.103.2.70 src/prefs_common.h;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/common/ssl_certificate.c;  ) > 2.6.1cvs13.patchset
 ( cvs diff -u -r 1.105.2.70 -r 1.105.2.71 src/prefs_account.c;  ) > 2.6.1cvs14.patchset
+( cvs diff -u -r 1.105.2.71 -r 1.105.2.72 src/prefs_account.c;  ) > 2.6.1cvs15.patchset

diff --git a/configure.ac b/configure.ac
index 606c22427cbccdeb204ec29fd6f83291e433212c..d8a4d8347e72e4323997c090db24806c8c9b0641 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=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 4389fcdaeaebbfe67f64997e17af589e2cab5e18..dd7742cf39e87d598419d05d5443404ed87f0f7f 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2521,6 +2521,14 @@ static gint prefs_account_apply(void)
                alertpanel_error(_("POP3 server is not entered."));
                return -1;
        }
+       if (protocol == A_POP3) {
+               const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(receive.inbox_entry));
+               FolderItem *inbox =  folder_find_item_from_identifier(mailbox);
+               if (inbox == NULL) {
+                       alertpanel_error(_("The default inbox folder doesn't exist."));
+                       return -1;
+               }
+       }
        if (protocol == A_IMAP4 &&
            *gtk_entry_get_text(GTK_ENTRY(basic.recvserv_entry)) == '\0') {
                alertpanel_error(_("IMAP4 server is not entered."));