aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-05-09 00:06:42 +0800
committerXan Lopez <xan@igalia.com>2012-05-09 00:06:42 +0800
commit871693a8ea637bb8b5ed4d77fbb7698264a3876e (patch)
tree7c6a9ce1d81f7f6feddfddd6d05674cf01bd61d4 /lib
parent616fe15f7781921ec5d71fdcda76476137058a0f (diff)
downloadgsoc2013-epiphany-871693a8ea637bb8b5ed4d77fbb7698264a3876e.tar.gz
gsoc2013-epiphany-871693a8ea637bb8b5ed4d77fbb7698264a3876e.tar.zst
gsoc2013-epiphany-871693a8ea637bb8b5ed4d77fbb7698264a3876e.zip
ephy-profile-migrator: migrate the profile dir location before anything else
Otherwise we'll read the .migrated file *before* we move the old profile. Not OK, it will make us start from scratch all the migration
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-profile-migrator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index 093418c30..055878623 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -697,15 +697,15 @@ ephy_migrator ()
{
int latest, i;
+ /* Always try to migrate the data from the old profile dir at the
+ * very beginning. */
+ migrate_profile_gnome2_to_xdg ();
+
latest = ephy_profile_utils_get_migration_version ();
LOG ("Running migrators up to version %d, current migration version is %d.",
EPHY_PROFILE_MIGRATION_VERSION, latest);
- /* Always try to migrate the data from the old profile dir at the
- * very beginning. */
- migrate_profile_gnome2_to_xdg ();
-
for (i = latest; i < EPHY_PROFILE_MIGRATION_VERSION; i++) {
EphyProfileMigrator m;