aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-window.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e5720ffc1..c03e829fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-18 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-window.c: (ephy_window_open_link):
+
+ Also disallow opening a new tab from EphyLink iface in popup mode.
+
2005-04-17 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-automation.c:
diff --git a/src/ephy-window.c b/src/ephy-window.c
index b24ebfa6e..dff44fed2 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2705,6 +2705,7 @@ ephy_window_open_link (EphyLink *link,
EphyLinkFlags flags)
{
EphyWindow *window = EPHY_WINDOW (link);
+ EphyWindowPrivate *priv = window->priv;
EphyTab *new_tab;
g_return_val_if_fail (address != NULL, NULL);
@@ -2725,7 +2726,8 @@ ephy_window_open_link (EphyLink *link,
{
ntflags |= EPHY_NEW_TAB_JUMP;
}
- if (flags & EPHY_LINK_NEW_WINDOW)
+ if (flags & EPHY_LINK_NEW_WINDOW ||
+ (flags & EPHY_LINK_NEW_TAB && priv->is_popup))
{
ntflags |= EPHY_NEW_TAB_IN_NEW_WINDOW;
}