+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
( 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
if (!run_wizard(mainwin, FALSE))
exit(1);
account_read_config_all();
- if(!account_get_list())
+ if(!account_get_list()) {
exit_claws(mainwin);
+ exit(1);
+ }
}
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;