diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2018-03-25 15:52:24 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2018-03-25 15:58:20 -0500 |
| commit | 873f4459affd32d07bc631d9610bc2e7feb8fb1a (patch) | |
| tree | 0860d56c868b14eb9437a9b7ca4da945d8552d29 /src/profile-migrator | |
| parent | 4d78f0db2c3a29c0c6a088df3c60fe515434b9dc (diff) | |
| download | epiphany-873f4459affd32d07bc631d9610bc2e7feb8fb1a.tar.gz | |
Reorder search engines migrator to ensure it does not fail
The search engines migrator relies on EphyBookmarksManager, so we need
to move it after the bookmarks timestamp migrator or it will fail. This
fixes upgrades from old (pre-3.24) versions of Epiphany.
https://bugzilla.gnome.org/show_bug.cgi?id=794645
Diffstat (limited to 'src/profile-migrator')
| -rw-r--r-- | src/profile-migrator/ephy-profile-migrator.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/profile-migrator/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c index e01bc991e..42e23a0fe 100644 --- a/src/profile-migrator/ephy-profile-migrator.c +++ b/src/profile-migrator/ephy-profile-migrator.c @@ -594,6 +594,9 @@ migrate_settings (void) g_settings_sync (); } +/* Originally migrator #17, but moved to spot #27 because it uses the + * bookmarks manager, which requires that we have already run #24. + */ static void migrate_search_engines (void) { @@ -1214,7 +1217,7 @@ const EphyProfileMigrator migrators[] = { /* 14 */ migrate_initial_state, /* 15 */ migrate_permissions, /* 16 */ migrate_settings, - /* 17 */ migrate_search_engines, + /* 17 */ migrate_nothing, /* 18 */ migrate_icon_database, /* 19 */ migrate_passwords_to_firefox_sync_passwords, /* 20 */ migrate_history_to_firefox_sync_history, @@ -1223,7 +1226,8 @@ const EphyProfileMigrator migrators[] = { /* 23 */ migrate_sync_device_info, /* 24 */ migrate_bookmarks_timestamp, /* 25 */ migrate_passwords_timestamp, - /* 26 */ migrate_nothing + /* 26 */ migrate_nothing, + /* 27 */ migrate_search_engines }; static gboolean |