aboutsummaryrefslogtreecommitdiffstats
path: root/shell/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/main.c')
-rw-r--r--shell/main.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/shell/main.c b/shell/main.c
index bd7997a3f7..e4570f0668 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -109,6 +109,7 @@ static gchar **remaining_args;
/* Forward declarations */
void e_convert_local_mail (EShell *shell);
+void e_migrate_base_dirs (EShell *shell);
static void
categories_icon_theme_hack (void)
@@ -665,7 +666,15 @@ main (gint argc,
* 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. */
+ * want them dispatched until after the conversion is complete.
+ *
+ * Addendum: We need to perform the XDG Base Directory migration
+ * before converting the local mail store, because the
+ * conversion is triggered by checking for certain key
+ * files and directories under XDG_DATA_HOME. Without
+ * this the mail conversion will not trigger for users
+ * upgrading from Evolution 2.30 or older. */
+ e_migrate_base_dirs (shell);
e_convert_local_mail (shell);
e_shell_load_modules (shell);