From 4add89491510082e2e5c2d9d56c1952d76f5629b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= Date: Sun, 28 Jan 2007 20:24:03 +0000 Subject: Check for a potential veto. Fix #342951. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-01-28 Jean-François Rameau * embed/mozilla/ContentHandler.cpp: (GContentHandler::Show): Check for a potential veto. Fix #342951. svn path=/trunk/; revision=6858 --- ChangeLog | 6 ++++++ embed/mozilla/ContentHandler.cpp | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 28bfdc47f..cb34435e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-28 Jean-François Rameau + + * embed/mozilla/ContentHandler.cpp: (GContentHandler::Show): + + Check for a potential veto. Fix #342951. + 2007-01-28 Christian Persch * lib/ephy-node.c: (safe_write_string), (ephy_node_write_to_xml): diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 7815b5da8..dd190f0c0 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -93,6 +93,18 @@ GContentHandler::Show (nsIHelperAppLauncher *aLauncher, /* FIXME: handle aForced / aReason argument in some way? */ mContext = aContext; + + /* Check for a potential veto */ + nsCOMPtr window (do_GetInterface (aContext)); + GtkWidget *embed = EphyUtils::FindEmbed (window); + if (EPHY_IS_EMBED (embed)) + { + if (g_object_get_data (G_OBJECT (embed), "content-handler-deny")) + { + return NS_OK; + } + } + mLauncher = aLauncher; rv = Init (); NS_ENSURE_SUCCESS (rv, rv); -- cgit v1.2.3