[epiphany/gnome-3-28] Revert "Again disallow new tab action in app mode"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/gnome-3-28] Revert "Again disallow new tab action in app mode"
- Date: Fri, 1 Jun 2018 15:28:06 +0000 (UTC)
commit 006e94c85bb13665536da2e9806476c0d21dc119
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Fri Jun 1 10:27:14 2018 -0500
Revert "Again disallow new tab action in app mode"
This reverts commit c56294dd46db69c94f8238dd47f568ca57bc51c0.
Seems this has had unintended consequences.
https://bugzilla.gnome.org/show_bug.cgi?id=796204
src/ephy-notebook.c | 7 ++-----
src/ephy-window.c | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 4a05b933b..38338627f 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -344,12 +344,10 @@ static void
update_tabs_visibility (EphyNotebook *nb,
gboolean before_inserting)
{
- EphyEmbedShellMode mode;
gboolean show_tabs = FALSE;
guint num;
EphyPrefsUITabsBarVisibilityPolicy policy;
- mode = ephy_embed_shell_get_mode (EPHY_EMBED_SHELL (ephy_shell_get_default ()));
num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb));
if (before_inserting)
@@ -358,9 +356,8 @@ update_tabs_visibility (EphyNotebook *nb,
policy = g_settings_get_enum (EPHY_SETTINGS_UI,
EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY);
- if (mode != EPHY_EMBED_SHELL_MODE_APPLICATION &&
- ((policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_MORE_THAN_ONE && num > 1) ||
- policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_ALWAYS))
+ if (((policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_MORE_THAN_ONE && num > 1) ||
+ policy == EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY_ALWAYS))
show_tabs = TRUE;
/* Only show the tabs when the "tabs-allowed" property is TRUE. */
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 2bdf442d5..e7aa10f56 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2997,7 +2997,6 @@ static const char *disabled_actions_for_app_mode[] = { "open",
"save-as-application",
"encoding",
"bookmark-page",
- "new-tab",
"home" };
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]