[epiphany] ephy-main: run the migration for any instance that is not a temporary private one

[Claudio Saavedra <csaavedra src gnome org>]

commit 4757133c25efa9c7fe5c726f1f2d5681f345a5cb
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Mon Sep 3 17:42:10 2012 +0300

    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 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 4ea621a..b2fc704 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.");