aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@igalia.com>2012-04-07 14:04:53 +0800
committerDiego Escalante Urrelo <diegoe@igalia.com>2012-06-15 07:16:09 +0800
commite32345ae0752c2b292b7ce84c342700339fd0d25 (patch)
tree0070147ef9325e8cb035a11ccf69f097f0ee5995 /src
parent5abbb836ea12907dfa8deff8efcd3ca9f971e226 (diff)
downloadgsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.tar
gsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.tar.gz
gsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.tar.bz2
gsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.tar.lz
gsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.tar.xz
gsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.tar.zst
gsoc2013-epiphany-e32345ae0752c2b292b7ce84c342700339fd0d25.zip
ephy-shell: handy gboolean fullscreen_lockdown
https://bugzilla.gnome.org/show_bug.cgi?id=676905
Diffstat (limited to 'src')
-rw-r--r--src/ephy-shell.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 5b1038b15..3f124a5d6 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -677,6 +677,7 @@ ephy_shell_new_tab_full (EphyShell *shell,
{
EphyWindow *window;
EphyEmbed *embed = NULL;
+ gboolean fullscreen_lockdown = FALSE;
gboolean in_new_window = TRUE;
gboolean open_page = FALSE;
gboolean jump_to;
@@ -691,10 +692,9 @@ ephy_shell_new_tab_full (EphyShell *shell,
if (flags & EPHY_NEW_TAB_IN_EXISTING_WINDOW) in_new_window = FALSE;
if (flags & EPHY_NEW_TAB_DONT_COPY_HISTORY) copy_history = FALSE;
- in_new_window = in_new_window &&
- !g_settings_get_boolean
- (EPHY_SETTINGS_LOCKDOWN,
- EPHY_PREFS_LOCKDOWN_FULLSCREEN);
+ fullscreen_lockdown = g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN,
+ EPHY_PREFS_LOCKDOWN_FULLSCREEN);
+ in_new_window = in_new_window && !fullscreen_lockdown;
g_return_val_if_fail (open_page == (gboolean)(request != NULL), NULL);
jump_to = (flags & EPHY_NEW_TAB_JUMP) != 0;