aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-06-14 19:05:23 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-06-14 19:05:23 +0800
commita01ebeee69c4781df8b34f2928843417f58d2a15 (patch)
treee5c9a00743025f934909c233691a019e59521d43 /src/ephy-window.c
parent2ccb8c916575d21e2862cc38f98f92ef0f1d7b27 (diff)
downloadgsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.tar
gsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.tar.gz
gsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.tar.bz2
gsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.tar.lz
gsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.tar.xz
gsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.tar.zst
gsoc2013-epiphany-a01ebeee69c4781df8b34f2928843417f58d2a15.zip
Respect the bookmarks bar visibility user choice also for popups.
2003-06-14 Marco Pesenti Gritti <marco@it.gnome.org> * embed/ephy-embed-types.h: * embed/mozilla/mozilla-embed.cpp: * src/ephy-window.c: (translate_default_chrome), (ephy_window_set_chrome): Respect the bookmarks bar visibility user choice also for popups.
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0b9f38df3..aea9399f0 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1181,6 +1181,11 @@ ephy_window_get_chrome (EphyWindow *window)
static void
translate_default_chrome (EmbedChromeMask *chrome_mask)
{
+ gboolean bbar;
+
+ bbar = (*chrome_mask & EMBED_CHROME_BOOKMARKSBAR_DEFAULT) ||
+ (*chrome_mask & EMBED_CHROME_DEFAULT);
+
/* keep only not layout flags */
*chrome_mask &= (EMBED_CHROME_WINDOWRAISED |
EMBED_CHROME_WINDOWLOWERED |
@@ -1200,7 +1205,7 @@ translate_default_chrome (EmbedChromeMask *chrome_mask)
{
*chrome_mask |= EMBED_CHROME_TOOLBARON;
}
- if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR))
+ if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR) && bbar)
{
*chrome_mask |= EMBED_CHROME_BOOKMARKSBARON;
}
@@ -1338,7 +1343,8 @@ void
ephy_window_set_chrome (EphyWindow *window,
EmbedChromeMask flags)
{
- if (flags & EMBED_CHROME_DEFAULT)
+ if ((flags & EMBED_CHROME_DEFAULT) ||
+ (flags & EMBED_CHROME_BOOKMARKSBAR_DEFAULT))
{
translate_default_chrome (&flags);
}