diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | embed/ephy-embed-types.h | 19 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 2 | ||||
| -rw-r--r-- | src/ephy-window.c | 10 |
4 files changed, 29 insertions, 12 deletions
@@ -1,3 +1,13 @@ +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. + 2003-06-14 Christian Persch <chpe@cvs.gnome.org> * src/prefs-dialog.c: (create_fonts_language_menu): diff --git a/embed/ephy-embed-types.h b/embed/ephy-embed-types.h index d56cec05e..0e89b0c91 100644 --- a/embed/ephy-embed-types.h +++ b/embed/ephy-embed-types.h @@ -30,15 +30,16 @@ typedef enum EMBED_CHROME_MENUBARON = 1 << 1, EMBED_CHROME_TOOLBARON = 1 << 2, EMBED_CHROME_BOOKMARKSBARON = 1 << 3, - EMBED_CHROME_STATUSBARON = 1 << 4, - EMBED_CHROME_WINDOWRAISED = 1 << 5, - EMBED_CHROME_WINDOWLOWERED = 1 << 6, - EMBED_CHROME_CENTERSCREEN = 1 << 7, - EMBED_CHROME_OPENASDIALOG = 1 << 8, - EMBED_CHROME_OPENASCHROME = 1 << 9, - EMBED_CHROME_OPENASPOPUP = 1 << 10, - EMBED_CHROME_OPENASFULLSCREEN = 1 << 11, - EMBED_CHROME_PPVIEWTOOLBARON = 1 << 12, + EMBED_CHROME_BOOKMARKSBAR_DEFAULT = 1 << 4, + EMBED_CHROME_STATUSBARON = 1 << 5, + EMBED_CHROME_WINDOWRAISED = 1 << 6, + EMBED_CHROME_WINDOWLOWERED = 1 << 7, + EMBED_CHROME_CENTERSCREEN = 1 << 8, + EMBED_CHROME_OPENASDIALOG = 1 << 9, + EMBED_CHROME_OPENASCHROME = 1 << 10, + EMBED_CHROME_OPENASPOPUP = 1 << 11, + EMBED_CHROME_OPENASFULLSCREEN = 1 << 12, + EMBED_CHROME_PPVIEWTOOLBARON = 1 << 13 } EmbedChromeMask; G_END_DECLS diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index ab40ccee3..b4c04fa65 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -1402,7 +1402,7 @@ mozilla_embed_new_window_cb (GtkMozEmbed *embed, { GTK_MOZ_EMBED_FLAG_DEFAULTCHROME, EMBED_CHROME_DEFAULT }, { GTK_MOZ_EMBED_FLAG_MENUBARON, EMBED_CHROME_MENUBARON }, { GTK_MOZ_EMBED_FLAG_TOOLBARON, EMBED_CHROME_TOOLBARON }, - { GTK_MOZ_EMBED_FLAG_PERSONALTOOLBARON, EMBED_CHROME_BOOKMARKSBARON }, + { GTK_MOZ_EMBED_FLAG_PERSONALTOOLBARON, EMBED_CHROME_BOOKMARKSBAR_DEFAULT }, { GTK_MOZ_EMBED_FLAG_STATUSBARON, EMBED_CHROME_STATUSBARON }, { GTK_MOZ_EMBED_FLAG_WINDOWRAISED, EMBED_CHROME_WINDOWRAISED }, { GTK_MOZ_EMBED_FLAG_WINDOWLOWERED, EMBED_CHROME_WINDOWLOWERED }, 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); } |