[epiphany] profile-migrator: Move assert to more useful location
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] profile-migrator: Move assert to more useful location
- Date: Mon, 24 Jul 2017 17:45:24 +0000 (UTC)
commit 7e172660e800f07c3ddbc46b618ba9d6435b3785
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon Jul 24 12:43:36 2017 -0500
profile-migrator: Move assert to more useful location
This function is likely not going to run at all if the migration version
is not maintained properly, so it's not a great place to warn that the
migration version has not been updated.
src/profile-migrator/ephy-profile-migrator.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/profile-migrator/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c
index ee35fea..d42a778 100644
--- a/src/profile-migrator/ephy-profile-migrator.c
+++ b/src/profile-migrator/ephy-profile-migrator.c
@@ -1032,8 +1032,6 @@ ephy_migrator (void)
int latest, i;
EphyProfileMigrator m;
- g_assert (EPHY_PROFILE_MIGRATION_VERSION == G_N_ELEMENTS (migrators));
-
/* Always try to migrate the data from the old profile dir at the
* very beginning. */
migrate_profile_gnome2_to_xdg ();
@@ -1104,6 +1102,8 @@ main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
+ g_assert (EPHY_PROFILE_MIGRATION_VERSION == G_N_ELEMENTS (migrators));
+
option_group = g_option_group_new ("ephy-profile-migrator",
N_("Web profile migrator"),
N_("Web profile migrator options"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]