--- evolution-2.5.4/mail/em-migrate.c.firstmail 2006-01-02 12:38:59.000000000 +0100 +++ evolution-2.5.4/mail/em-migrate.c 2006-01-02 21:12:37.000000000 +0100 @@ -70,7 +70,7 @@ #include "em-utils.h" #include "em-migrate.h" -#define d(x) x +#define d(x) #ifndef G_OS_WIN32 @@ -1536,7 +1536,8 @@ dlen = destpath->len; while ((dent = readdir (dir))) { - if (!strcmp (dent->d_name, ".") || !strcmp (dent->d_name, "..")) + char *src; + if (!strcmp(dent->d_name, ".") || !strcmp(dent->d_name, "..") || !strcmp(dent->d_name, "Inbox")) continue; g_string_truncate (srcpath, slen); @@ -2645,7 +2646,7 @@ const char *d; struct stat st; const GList *l; - char *local, *base; + char *local, *base, *dest; /* special-case - this means brand new install of evolution */ /* FIXME: create default folders and stuff... */ @@ -2692,6 +2693,27 @@ } g_free(local); + + /* e.g. try en-AU then en, etc */ + for (l = gnome_i18n_get_language_list("LC_MESSAGES"); + l != NULL; + l = g_list_next(l)) { + local = g_strconcat (EVOLUTION_DATADIR "/mdk/mail/html/mail-", (char *)l->data, NULL); + if (stat(local, &st) == 0) + goto gotlocalmdk; + + g_free(local); + } + + local = g_strdup(EVOLUTION_DATADIR "/mdk/mail/html/mail-en"); + +gotlocalmdk: + dest = g_build_filename(base, "Inbox", NULL); + + cp(local, dest, FALSE, CP_UNIQUE); + g_free(dest); + + g_free(local); g_free(base); return 0;