aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xlopez@igalia.com>2011-09-11 21:51:27 +0800
committerXan Lopez <xlopez@igalia.com>2011-09-11 21:51:27 +0800
commit7644b0abc2fdc294d09f95584c835abbdbb96fd1 (patch)
treec26ac85779c986c2e66fd58d30a98a81de2b8396
parent2d26c13ddb3f59d86b4c3a2f2d2e211a15194852 (diff)
downloadgsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.tar
gsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.tar.gz
gsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.tar.bz2
gsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.tar.lz
gsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.tar.xz
gsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.tar.zst
gsoc2013-epiphany-7644b0abc2fdc294d09f95584c835abbdbb96fd1.zip
ephy-shell: do not resume session in web app mode
Session resume will ask to resume the session (opened pages, etc) if the previous instance crashed. We don't really want this in web app mode, so skip it. Note that this is not exactly the same than loading the session, which just restores the previous window sizes and states. We do want that, but the terminology here could be more clear. https://bugzilla.gnome.org/show_bug.cgi?id=658739
-rw-r--r--src/ephy-shell.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 8196370bf..e700f93fb 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -134,11 +134,12 @@ queue_commands (EphyShell *shell)
ctx = shell->priv->startup_context;
- /* We only get here when starting a new instance, so we first need
- to autoresume! */
- ephy_session_queue_command (session,
- EPHY_SESSION_CMD_RESUME_SESSION,
- NULL, NULL, ctx->user_time, TRUE);
+ /* We only get here when starting a new instance, so autoresume the
+ * session unless we are in application mode. */
+ if (ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (shell)) != EPHY_EMBED_SHELL_MODE_APPLICATION)
+ ephy_session_queue_command (session,
+ EPHY_SESSION_CMD_RESUME_SESSION,
+ NULL, NULL, ctx->user_time, TRUE);
if (ctx->startup_flags & EPHY_STARTUP_BOOKMARKS_EDITOR)
ephy_session_queue_command (session,