From 4757133c25efa9c7fe5c726f1f2d5681f345a5cb Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Mon, 3 Sep 2012 17:42:10 +0300 Subject: ephy-main: run the migration for any instance that is not a temporary private one https://bugzilla.gnome.org/show_bug.cgi?id=681679 --- src/ephy-main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ephy-main.c') diff --git a/src/ephy-main.c b/src/ephy-main.c index 4ea621afe..b2fc704be 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -389,8 +389,9 @@ main (int argc, /* Work-around Flash Player crash */ g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE); - /* TODO: we want to migrate each WebApp profile too. */ - if (!private_instance && !application_mode) { + /* Run the migration in all cases, except when running a private + instance without a given profile directory. */ + if (!(private_instance && profile_directory == FALSE)) { /* If the migration fails we don't really want to continue. */ if (!ephy_profile_utils_do_migration ((const char *)profile_directory, -1, FALSE)) { g_print ("Failed to run the migrator process, Web will now abort."); -- cgit v1.2.3