diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-11-18 21:52:05 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-11-18 21:52:05 +0800 |
| commit | 715b70c954ac694a0027039cea87bd33e0986679 (patch) | |
| tree | fa0eb2c2909337661f31d503d4c83d405b341513 | |
| parent | 978fdbb10a9e7e5ec5e498044722588a3b32368c (diff) | |
| download | gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.tar gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.tar.gz gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.tar.bz2 gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.tar.lz gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.tar.xz gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.tar.zst gsoc2013-epiphany-715b70c954ac694a0027039cea87bd33e0986679.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-- | 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 3b3905d70..8a15b39e6 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -325,7 +325,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void) mAction = CONTENT_ACTION_OPEN_TMP; } - if (!mHelperApp || mPermission == EPHY_MIME_PERMISSION_UNSAFE) + if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE) { mAction = CONTENT_ACTION_DOWNLOAD; } @@ -339,7 +339,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; |