From 4b9dcfe60460ed45c5ad2b5020cdf678b1629850 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Thu, 30 Jun 2011 17:06:20 +0200 Subject: Add an --application-mode flag and global mode For now it's pretty much like a private instance, but: - A profile directory *must* be passed - Global passwords and cookies are accessed. In the future we'll likely restrict cookies to the ones for the web application domain, which we'll copy from the main cookies file. --- src/ephy-shell.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ephy-shell.c') diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 594301ec0..cbf261a01 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -179,7 +179,8 @@ ephy_shell_startup (GApplication* application) { /* We're not remoting; start our services */ /* Migrate profile if we are not running a private instance */ - if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (application)) != EPHY_EMBED_SHELL_MODE_PRIVATE && + /* TODO: we want to migrate each WebApp profile too */ + if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (application)) == EPHY_EMBED_SHELL_MODE_BROWSER && ephy_profile_utils_get_migration_version () < EPHY_PROFILE_MIGRATION_VERSION) { GError *error = NULL; @@ -365,7 +366,7 @@ ephy_shell_before_emit (GApplication *application, static void ephy_shell_constructed (GObject *object) { - if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (object)) == EPHY_EMBED_SHELL_MODE_PRIVATE) + if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (object)) != EPHY_EMBED_SHELL_MODE_BROWSER) { GApplicationFlags flags; -- cgit v1.2.3