[epiphany/mcatanzaro/automation-always-close-window] window: ignore keep-window-open in automation mode
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/automation-always-close-window] window: ignore keep-window-open in automation mode
- Date: Tue, 8 Jan 2019 17:52:41 +0000 (UTC)
commit b5ed7abb6f8e061b41d25b64896bc9831f9d5a96
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Tue Jan 8 11:51:35 2019 -0600
window: ignore keep-window-open in automation mode
WebDriver tests are going to have a hard time if the window stays open
after the last tab is closed, so ignore our new setting in that case.
src/ephy-window.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 483c1f1fd..234d3f734 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2676,7 +2676,9 @@ static void
ephy_window_close_tab (EphyWindow *window,
EphyEmbed *tab)
{
- gboolean keep_window_open;
+ EphyEmbedShell *shell = ephy_embed_shell_get_default ();
+ EphyEmbedShellMode mode = ephy_embed_shell_get_mode (shell);
+ gboolean keep_window_open = FALSE;
/* This function can be called many times for the same embed if the
* web process (or network process) has hung. E.g. the user could
@@ -2699,7 +2701,8 @@ ephy_window_close_tab (EphyWindow *window,
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tab), "ephy-window-close-tab-closed")))
return;
- keep_window_open = g_settings_get_boolean (EPHY_SETTINGS_UI, EPHY_PREFS_UI_KEEP_WINDOW_OPEN);
+ if (mode != EPHY_EMBED_SHELL_MODE_AUTOMATION)
+ keep_window_open = g_settings_get_boolean (EPHY_SETTINGS_UI, EPHY_PREFS_UI_KEEP_WINDOW_OPEN);
if (keep_window_open && gtk_notebook_get_n_pages (window->notebook) == 1) {
EphyWebView *view = ephy_embed_get_web_view (tab);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]