aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-11-18 21:50:46 +0800
committerChristian Persch <chpe@src.gnome.org>2004-11-18 21:50:46 +0800
commit74fa0412fb03b25b09465d1191dc43beedf37b02 (patch)
treee7077fa4971add83cde020750d3164c8375d9beb
parent61e750e762ea9112ebfa8339808021ab3c1d2c7e (diff)
downloadgsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.tar
gsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.tar.gz
gsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.tar.bz2
gsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.tar.lz
gsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.tar.xz
gsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.tar.zst
gsoc2013-epiphany-74fa0412fb03b25b09465d1191dc43beedf37b02.zip
Fix opening of content when not downloading automatically. Fixes bug
2004-11-18 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/ContentHandler.cpp: Fix opening of content when not downloading automatically. Fixes bug #158466.
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/ContentHandler.cpp5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6eb378a9d..a766c0971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-11-18 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/ContentHandler.cpp:
+
+ Fix opening of content when not downloading automatically.
+ Fixes bug #158466.
+
+2004-11-18 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 32c887e6c..c9d50cf12 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -320,7 +320,7 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void)
mAction = CONTENT_ACTION_OPEN_TMP;
}
- if (!mHelperApp || mPermission == EPHY_MIME_PERMISSION_UNSAFE)
+ if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE)
{
mAction = CONTENT_ACTION_DOWNLOAD;
}
@@ -343,7 +343,8 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
mLauncher->GetMIMEInfo(getter_AddRefs(mimeInfo));
NS_ENSURE_TRUE (mimeInfo, NS_ERROR_FAILURE);
- if (mAction == CONTENT_ACTION_OPEN)
+ if (mAction == CONTENT_ACTION_OPEN ||
+ mAction == CONTENT_ACTION_OPEN_TMP )
{
nsEmbedString desc;