ephy-profile-migrator: allow running migration in non-default profile directories

This is necessary since we add new columns to the history database in
step 8 of migration. However, non-default profile directories don't
have a .migrated file right now but, since up to step 7 it was
possible to use these profiles without migration, it is safe to assume
that a non-default profile without a .migrated file can be migrated
starting from step 8.

https://bugzilla.gnome.org/show_bug.cgi?id=681679

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index 829d68925..58abfff61 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -51,6 +51,14 @@ ephy_profile_utils_get_migration_version ()
 
     if (result != 1)
       latest = 0;
+  } else if (ephy_dot_dir_is_default () == FALSE) {
+    /* Since version 8, we need to migrate also profile directories
+       other than the default one. Profiles in such directories work
+       perfectly fine without going through the first 7 migration
+       steps, so it is safe to assume that any non-default profile
+       directory without a migration file can be migrated starting
+       from the step 8. */
+    latest = 7;
   }
 
   g_free (migrated_file);