aboutsummaryrefslogtreecommitdiffstats
path: root/src/window-commands.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window-commands.c')
-rw-r--r--src/window-commands.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/window-commands.c b/src/window-commands.c
index 38724702f..1562d1b7f 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -286,7 +286,7 @@ window_cmd_file_new_window (GtkAction *action,
tab = ephy_window_get_active_tab (window);
g_return_if_fail (tab != NULL);
- ephy_shell_new_tab (ephy_shell, NULL, tab, NULL,
+ ephy_shell_new_tab (ephy_shell, window, tab, NULL,
EPHY_NEW_TAB_NEW_PAGE |
EPHY_NEW_TAB_IN_NEW_WINDOW);
}
@@ -451,6 +451,12 @@ window_cmd_file_close_window (GtkAction *action,
{
EphyTab *tab;
+ if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_QUIT) &&
+ gtk_notebook_get_n_pages (GTK_NOTEBOOK (ephy_window_get_notebook (window))) == 1)
+ {
+ return;
+ }
+
tab = ephy_window_get_active_tab (window);
g_return_if_fail (tab != NULL);