diff options
Diffstat (limited to 'embed')
-rw-r--r-- | embed/ephy-embed.c | 1 | ||||
-rw-r--r-- | embed/ephy-embed.h | 14 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 9f1686840..c38d8b5ce 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -39,7 +39,6 @@ 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_MENUBAR", "menubar" }, { EPHY_EMBED_CHROME_TOOLBAR, "EPHY_EMBED_CHROME_TOOLBAR", "toolbar" }, { EPHY_EMBED_CHROME_STATUSBAR, "EPHY_EMBED_CHROME_STATUSBAR", "statusbar" }, diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index c2fcb2e91..809a21a56 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -59,13 +59,17 @@ 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_BOOKMARKSBAR = 1 << 4 + EPHY_EMBED_CHROME_MENUBAR = 1 << 0, + EPHY_EMBED_CHROME_TOOLBAR = 1 << 1, + EPHY_EMBED_CHROME_STATUSBAR = 1 << 2, + EPHY_EMBED_CHROME_BOOKMARKSBAR = 1 << 3 } EphyEmbedChrome; +#define EPHY_EMBED_CHROME_ALL (EPHY_EMBED_CHROME_MENUBAR | \ + EPHY_EMBED_CHROME_TOOLBAR | \ + EPHY_EMBED_CHROME_STATUSBAR | \ + EPHY_EMBED_CHROME_BOOKMARKSBAR) + typedef enum { EMBED_RELOAD_NORMAL = 1 << 0, diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 8f0fe578b..3ab68b9ab 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -997,7 +997,6 @@ mozilla_embed_new_window_cb (GtkMozEmbed *embed, } conversion_map [] = { - { GTK_MOZ_EMBED_FLAG_DEFAULTCHROME, EPHY_EMBED_CHROME_DEFAULT }, { 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 }, |