From 1723ee09122a8e137e78ed301f2706eefb281adf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 Mar 2013 19:28:50 -0400 Subject: Fix mbox-to-Maildir conversion... again. Commit ee5671fc fixed mbox-to-Maildir conversion for users upgrading from Evolution 2.32, who had already migrated to XDG Base Directories. But turns out, mbox-to-Maildir conversion was still broken for users coming from Evolution 2.30 or earlier because the logic to move files into XDG Base Directories was running *after* the conversion routine. So the conversion routine found nothing to convert, and users were left with a broken "On This Computer" mail store. This commit runs the XDG Base Directory migration first on startup, followed by the mbox-to-Maildir conversion. --- shell/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'shell/Makefile.am') diff --git a/shell/Makefile.am b/shell/Makefile.am index bd2fe53dbd..8961444800 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -123,7 +123,8 @@ evolution_CPPFLAGS = \ evolution_SOURCES = \ main.c \ - e-convert-local-mail.c + e-convert-local-mail.c \ + e-migrate-base-dirs.c evolution_LDADD = \ libeshell.la \ -- cgit v1.2.3