aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-04-01 20:31:05 +0800
committerChristian Persch <chpe@src.gnome.org>2004-04-01 20:31:05 +0800
commit242a4fd05a48641f738e30cc27534623f545ddbc (patch)
tree177e91053815a516e7ace474f7ee68df930cfa79 /embed
parent4af17ff6353de154008c21f25cc21cf5533ed650 (diff)
downloadgsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.tar
gsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.tar.gz
gsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.tar.bz2
gsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.tar.lz
gsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.tar.xz
gsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.tar.zst
gsoc2013-epiphany-242a4fd05a48641f738e30cc27534623f545ddbc.zip
Fix bookmarks toolbar visibility in fullscreen and print preview mode, as
2004-04-01 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed.c: (ephy_embed_chrome_get_type): * embed/ephy-embed.h: * embed/mozilla/mozilla-embed.cpp: * src/ephy-window.c: (get_chromes_visibility), (sync_chromes_visibility), (update_chromes_actions), (get_default_chrome), (ephy_window_init), (sync_prefs_with_chrome), (ephy_window_view_bookmarksbar_cb): Fix bookmarks toolbar visibility in fullscreen and print preview mode, as well as for javascript popups. Fixes bug #138520.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed.c7
-rw-r--r--embed/ephy-embed.h9
-rw-r--r--embed/mozilla/mozilla-embed.cpp1
3 files changed, 10 insertions, 7 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 00f8b25d8..9f1686840 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -40,9 +40,10 @@ ephy_embed_chrome_get_type (void)
static const GFlagsValue values[] =
{
{ EPHY_EMBED_CHROME_DEFAULT, "EPHY_EMBED_CHROME_DEFAULT", "default" },
- { EPHY_EMBED_CHROME_MENUBAR, "EPHY_EMBED_CHROME_MENUBARON", "menubar" },
- { EPHY_EMBED_CHROME_TOOLBAR, "EPHY_EMBED_CHROME_TOOLBARON", "toolbar" },
- { EPHY_EMBED_CHROME_STATUSBAR, "EPHY_EMBED_CHROME_STATUSBARON", "statusbar" },
+ { EPHY_EMBED_CHROME_MENUBAR, "EPHY_EMBED_CHROME_MENUBAR", "menubar" },
+ { EPHY_EMBED_CHROME_TOOLBAR, "EPHY_EMBED_CHROME_TOOLBAR", "toolbar" },
+ { EPHY_EMBED_CHROME_STATUSBAR, "EPHY_EMBED_CHROME_STATUSBAR", "statusbar" },
+ { EPHY_EMBED_CHROME_BOOKMARKSBAR, "EPHY_EMBED_CHROME_BOOKMARKSBAR", "bookmarksbar" },
{ 0, NULL, NULL }
};
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 217d3df2a..c2fcb2e91 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -59,10 +59,11 @@ typedef enum
typedef enum
{
- EPHY_EMBED_CHROME_DEFAULT = 1 << 0,
- EPHY_EMBED_CHROME_MENUBAR = 1 << 1,
- EPHY_EMBED_CHROME_TOOLBAR = 1 << 2,
- EPHY_EMBED_CHROME_STATUSBAR = 1 << 3
+ EPHY_EMBED_CHROME_DEFAULT = 1 << 0,
+ EPHY_EMBED_CHROME_MENUBAR = 1 << 1,
+ EPHY_EMBED_CHROME_TOOLBAR = 1 << 2,
+ EPHY_EMBED_CHROME_STATUSBAR = 1 << 3,
+ EPHY_EMBED_CHROME_BOOKMARKSBAR = 1 << 4
} EphyEmbedChrome;
typedef enum
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index e02abad73..8f0fe578b 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -1001,6 +1001,7 @@ mozilla_embed_new_window_cb (GtkMozEmbed *embed,
{ GTK_MOZ_EMBED_FLAG_MENUBARON, EPHY_EMBED_CHROME_MENUBAR },
{ GTK_MOZ_EMBED_FLAG_TOOLBARON, EPHY_EMBED_CHROME_TOOLBAR },
{ GTK_MOZ_EMBED_FLAG_STATUSBARON, EPHY_EMBED_CHROME_STATUSBAR },
+ { GTK_MOZ_EMBED_FLAG_PERSONALTOOLBARON, EPHY_EMBED_CHROME_BOOKMARKSBAR },
{ 0, 0 }
};