[epiphany] ephy-profile-migrator: migrate the profile dir location before anything else



commit 871693a8ea637bb8b5ed4d77fbb7698264a3876e
Author: Xan Lopez <xan igalia com>
Date:   Tue May 8 18:06:42 2012 +0200

    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

 lib/ephy-profile-migrator.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index 093418c..0558786 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;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]