2006-12-12 [colin] 2.6.1cvs23
authorColin Leroy <colin@colino.net>
Tue, 12 Dec 2006 21:56:30 +0000 (21:56 +0000)
committerColin Leroy <colin@colino.net>
Tue, 12 Dec 2006 21:56:30 +0000 (21:56 +0000)
* src/main.c
Don't exit when there's an incomplete
mailbox configured - leaves a chance
to fix a failing IMAP account. Exit
if no mailbox at all is loaded (case
of missing plugin).
Completes bug 1077's fix (I was wrong
in this bug's comment #3).

ChangeLog
PATCHSETS
configure.ac
src/main.c

index ba14e7dbc0793fc95bbc3fea99a6dbf5ea6a4f54..df686f0d09b1e08e86ed324b9c127f79f2955db0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-12 [colin]     2.6.1cvs23
+
+       * src/main.c
+               Don't exit when there's an incomplete
+               mailbox configured - leaves a chance 
+               to fix a failing IMAP account. Exit
+               if no mailbox at all is loaded (case
+               of missing plugin).
+               Completes bug 1077's fix (I was wrong
+               in this bug's comment #3).
+
 2006-12-12 [colin]     2.6.1cvs22
 
        * src/gtk/menu.h
index d61591349c868b05dd635fe5616e530609b64433..4c9d678ea90b6dfb14bbca5bbef971c335d11941 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/combobox.c;  ) > 2.6.1cvs20.patchset
 ( cvs diff -u -r 1.105.2.73 -r 1.105.2.74 src/prefs_account.c;  ) > 2.6.1cvs21.patchset
 ( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/gtk/menu.h;  cvs diff -u -r 1.105.2.74 -r 1.105.2.75 src/prefs_account.c;  ) > 2.6.1cvs22.patchset
+( cvs diff -u -r 1.115.2.116 -r 1.115.2.117 src/main.c;  ) > 2.6.1cvs23.patchset
index 044d06525f367faa38aa20b6b85c03ee3750e192..38ab63647ced4163fa1b763881b14c3ce3333d4b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 3b92373d132146e4d8ad6528189b67b72785b46b..0f957b7998ef67cd530a25cb88f335e5fa353a4c 100644 (file)
@@ -728,8 +728,10 @@ int main(int argc, char *argv[])
                if (!run_wizard(mainwin, FALSE))
                        exit(1);
                account_read_config_all();
-               if(!account_get_list())
+               if(!account_get_list()) {
                        exit_claws(mainwin);
+                       exit(1);
+               }
        }
 
        
@@ -811,13 +813,21 @@ int main(int argc, char *argv[])
        if (!folder_have_mailbox()) {
                prefs_destroy_cache();
                main_window_cursor_normal(mainwin);
-               alertpanel_error(_("Claws Mail has detected a configured "
+               if (folder_get_list() != NULL) {
+                       alertpanel_error(_("Claws Mail has detected a configured "
+                                  "mailbox, but is it incomplete. It is "
+                                  "possibly due to a failing IMAP account. Use "
+                                  "\"Rebuild folder tree\" on the mailbox's folder "
+                                  "to try to fix it."));
+               } else {
+                       alertpanel_error(_("Claws Mail has detected a configured "
                                   "mailbox, but could not load it. It is "
                                   "probably provided by an out-of-date "
                                   "external plugin. Please reinstall the "
-                                  "plugin and try again.\nIt may also be "
-                                  "due to a failing IMAP account."));
-               exit(1);
+                                  "plugin and try again."));
+                       exit_claws(mainwin);
+                       exit(1);
+               }
        }
        
        static_mainwindow = mainwin;