From 05c6fc746dbf135d87b214d0f741bf533eb16b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= Date: Wed, 8 Feb 2006 22:20:02 +0000 Subject: Block popup with NULL url (javascript:window.open() for instance). but MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-02-08 Jean-François Rameau * embed/mozilla/EphyBrowser.cpp: (HandleEvent): * src/ephy-tab.c: (popups_manager_add),(popups_manager_show): Block popup with NULL url (javascript:window.open() for instance). but don't show them when unblocking. Bug #155009. --- src/ephy-tab.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/ephy-tab.c') diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 8a95ff477..2fa0c31aa 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -535,7 +535,7 @@ popups_manager_add (EphyTab *tab, popup = g_new0 (PopupInfo, 1); - popup->url = g_strdup (url); + popup->url = (url == NULL) ? NULL : g_strdup (url); popup->name = g_strdup (name); popup->features = g_strdup (features); @@ -651,14 +651,17 @@ popups_manager_show (PopupInfo *popup, EphyEmbed *embed; EphyEmbedSingle *single; - embed = ephy_tab_get_embed (tab); - - single = EPHY_EMBED_SINGLE - (ephy_embed_shell_get_embed_single (embed_shell)); + /* Only show popup with non NULL url */ + if (popup->url != NULL) + { + embed = ephy_tab_get_embed (tab); - ephy_embed_single_open_window (single, embed, popup->url, - popup->name, popup->features); + single = EPHY_EMBED_SINGLE + (ephy_embed_shell_get_embed_single (embed_shell)); + ephy_embed_single_open_window (single, embed, popup->url, + popup->name, popup->features); + } popups_manager_free_info (popup); } -- cgit v1.2.3