From 74fa0412fb03b25b09465d1191dc43beedf37b02 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Thu, 18 Nov 2004 13:50:46 +0000 Subject: Fix opening of content when not downloading automatically. Fixes bug 2004-11-18 Christian Persch * embed/mozilla/ContentHandler.cpp: Fix opening of content when not downloading automatically. Fixes bug #158466. --- embed/mozilla/ContentHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'embed') 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; -- cgit v1.2.3