CVS: sylpheedclaws/sylpheed-claws/src main.c,1.115.2.116,1.115.2.117

Update of /pack/anoncvs/sylpheedclaws/sylpheed-claws/src
In directory sunsite.dk:/tmp/cvs-serv16042/src

Modified Files:
      Tag: gtk2
	main.c 
Log Message:
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).

Index: main.c
===================================================================
RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/main.c,v
retrieving revision 1.115.2.116
retrieving revision 1.115.2.117
diff -u -d -r1.115.2.116 -r1.115.2.117
--- main.c	2006/12/11 22:11:43	1.115.2.116
+++ main.c	2006/12/12 21:56:22	1.115.2.117
@@ -728,8 +728,10 @@
 		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 @@
 	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;