diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -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; |