diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-main.c | 4 | ||||
| -rw-r--r-- | src/ephy-shell.c | 20 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c index 5b3dad0dd..a9b71dd89 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -387,6 +387,10 @@ 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) + ephy_profile_utils_do_migration (); + /* Start our services */ if (!ephy_file_helpers_init (profile_directory, private_instance || application_mode, diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 18236420f..c8f3c27a4 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -37,7 +37,6 @@ #include "ephy-lockdown.h" #include "ephy-prefs.h" #include "ephy-private.h" -#include "ephy-profile-utils.h" #include "ephy-session.h" #include "ephy-settings.h" #include "ephy-type-builtins.h" @@ -264,27 +263,8 @@ ephy_shell_startup (GApplication* application) G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); /* We're not remoting; start our services */ - /* Migrate profile if we are not running a private instance */ - /* TODO: we want to migrate each WebApp profile too */ mode = ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (application)); - if (mode == EPHY_EMBED_SHELL_MODE_BROWSER) { - if (ephy_profile_utils_get_migration_version () < EPHY_PROFILE_MIGRATION_VERSION) { - GError *error = NULL; - char *argv[1] = { "ephy-profile-migrator" }; - char *envp[1] = { "EPHY_LOG_MODULES=ephy-profile" }; - - g_spawn_sync (NULL, argv, envp, G_SPAWN_SEARCH_PATH, - NULL, NULL, NULL, NULL, - NULL, &error); - - if (error) { - LOG ("Failed to run migrator: %s", error->message); - g_error_free (error); - } - } - } - if (mode != EPHY_EMBED_SHELL_MODE_APPLICATION) { GtkBuilder *builder; |