Run mbox-to-Maildir conversion before loading modules.

Invoke the mbox-to-Maildir conversion directly from main(), just
before the call to e_shell_load_modules().

The reason the code is here and not in the mail module is because
we inform the user at startup of the impending mail conversion by
displaying a popup dialog and waiting for confirmation.

This has to be done before we load modules because some of the
EShellBackends immediately add GMainContext sources that would
otherwise get dispatched during gtk_dialog_run(), and we don't
want then dispatched until after the conversion is complete.

1 files changed, 15 insertions, 0 deletions

diff --git a/shell/main.c b/shell/main.c
index d6de1499e4..a19614d76c 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -114,6 +114,9 @@ static gchar *geometry = NULL;
 static gchar *requested_view = NULL;
 static gchar **remaining_args;
 
+/* Forward declarations */
+void e_convert_local_mail (EShell *shell);
+
 static void
 categories_icon_theme_hack (void)
 {
@@ -644,6 +647,18 @@ main (gint argc,
 		goto exit;
 	}
 
+	/* This routine converts the local mail store from mbox format to
+	 * Maildir format as needed.  The reason the code is here and not
+	 * in the mail module is because we inform the user at startup of
+	 * the impending mail conversion by displaying a popup dialog and
+	 * waiting for confirmation before proceeding.
+	 *
+	 * This has to be done before we load modules because some of the
+	 * EShellBackends immediately add GMainContext sources that would
+	 * otherwise get dispatched during gtk_dialog_run(), and we don't
+	 * want them dispatched until after the conversion is complete. */
+	e_convert_local_mail (shell);
+
 	e_shell_load_modules (shell);
 
 	if (!disable_eplugin) {