diff options
| author | Claudio Saavedra <csaavedra@igalia.com> | 2012-09-03 22:42:10 +0800 |
|---|---|---|
| committer | Claudio Saavedra <csaavedra@igalia.com> | 2012-09-04 02:37:15 +0800 |
| commit | 4757133c25efa9c7fe5c726f1f2d5681f345a5cb (patch) | |
| tree | b90875c770801903c65e67aec8d6e81af0f1bbb3 /src/ephy-main.c | |
| parent | 95eb18e603accc3dd23c32c9dfbdf79b1723d391 (diff) | |
| download | gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.tar gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.tar.gz gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.tar.bz2 gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.tar.lz gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.tar.xz gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.tar.zst gsoc2013-epiphany-4757133c25efa9c7fe5c726f1f2d5681f345a5cb.zip | |
ephy-main: run the migration for any instance that is not a temporary private one
https://bugzilla.gnome.org/show_bug.cgi?id=681679
Diffstat (limited to 'src/ephy-main.c')
| -rw-r--r-- | src/ephy-main.c | 5 |
1 files changed, 3 insertions, 2 deletions
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."); |