From 873f4459affd32d07bc631d9610bc2e7feb8fb1a Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Sun, 25 Mar 2018 15:52:24 -0500 Subject: 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 --- src/profile-migrator/ephy-profile-migrator.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/profile-migrator') 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 -- cgit v1.2.1