diff options
| -rw-r--r-- | embed/ephy-web-view.c | 4 | ||||
| -rw-r--r-- | embed/ephy-web-view.h | 10 | ||||
| -rw-r--r-- | src/ephy-shell.c | 5 |
3 files changed, 5 insertions, 14 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c index e4ae30f09..2b4af2954 100644 --- a/embed/ephy-web-view.c +++ b/embed/ephy-web-view.c @@ -202,11 +202,9 @@ popups_manager_new_window_info (EphyEmbedContainer *container) gtk_widget_get_allocation (GTK_WIDGET (embed), &allocation); features = g_strdup_printf - ("width=%d,height=%d,menubar=%d,status=%d,toolbar=%d", + ("width=%d,height=%d,toolbar=%d", allocation.width, allocation.height, - (chrome & EPHY_WEB_VIEW_CHROME_MENUBAR) > 0, - (chrome & EPHY_WEB_VIEW_CHROME_STATUSBAR) > 0, (chrome & EPHY_WEB_VIEW_CHROME_TOOLBAR) > 0); return features; diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h index 1ffa7ee8a..2bdd7dbed 100644 --- a/embed/ephy-web-view.h +++ b/embed/ephy-web-view.h @@ -51,16 +51,10 @@ typedef enum typedef enum { - EPHY_WEB_VIEW_CHROME_MENUBAR = 1 << 0, - EPHY_WEB_VIEW_CHROME_TOOLBAR = 1 << 1, - EPHY_WEB_VIEW_CHROME_STATUSBAR = 1 << 2, - EPHY_WEB_VIEW_CHROME_BOOKMARKSBAR = 1 << 3 + EPHY_WEB_VIEW_CHROME_TOOLBAR = 1 << 0, } EphyWebViewChrome; -#define EPHY_WEB_VIEW_CHROME_ALL (EPHY_WEB_VIEW_CHROME_MENUBAR | \ - EPHY_WEB_VIEW_CHROME_TOOLBAR | \ - EPHY_WEB_VIEW_CHROME_STATUSBAR | \ - EPHY_WEB_VIEW_CHROME_BOOKMARKSBAR) +#define EPHY_WEB_VIEW_CHROME_ALL (EPHY_WEB_VIEW_CHROME_TOOLBAR) typedef enum { diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 35325b8cf..36e453f90 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -514,10 +514,9 @@ ephy_shell_new_window_cb (EphyEmbedSingle *single, parent = gtk_widget_get_toplevel (GTK_WIDGET (parent_embed)); } - /* what's a popup ? ATM, any window opened with menubar toggled on - * is *not* a popup + /* Any window opened with a toolbar is *not* a popup. */ - is_popup = (chromemask & EPHY_WEB_VIEW_CHROME_MENUBAR) == 0; + is_popup = (chromemask & EPHY_WEB_VIEW_CHROME_TOOLBAR) == 0; return ephy_shell_new_tab_full (shell, |