aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-shell.c
diff options
context:
space:
mode:
authorXan Lopez <xlopez@igalia.com>2011-06-30 23:06:20 +0800
committerXan Lopez <xlopez@igalia.com>2011-06-30 23:17:28 +0800
commit4b9dcfe60460ed45c5ad2b5020cdf678b1629850 (patch)
treef0ee5126b51f60ed39e20a6e2e6c2b571df4424e /src/ephy-shell.c
parentf594ec68442049ad9b6ecce598f2623e0ece9049 (diff)
downloadgsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.tar
gsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.tar.gz
gsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.tar.bz2
gsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.tar.lz
gsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.tar.xz
gsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.tar.zst
gsoc2013-epiphany-4b9dcfe60460ed45c5ad2b5020cdf678b1629850.zip
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.
Diffstat (limited to 'src/ephy-shell.c')
-rw-r--r--src/ephy-shell.c5
1 files changed, 3 insertions, 2 deletions
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;