aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/ContentHandler.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index ed052cdb0..2c8e0e93d 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -411,6 +411,19 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void)
mPermission = ephy_file_check_mime (mMimeType);
#endif
+ /* HACK! Check that this 'helper application' isn't Epiphany itself,
+ * see bug #310023.
+ */
+ if (mHelperApp)
+ {
+ const char *id = gnome_vfs_mime_application_get_desktop_id (mHelperApp);
+
+ if (id && strcmp (id, "epiphany.desktop") == 0)
+ {
+ mHelperApp = nsnull;
+ }
+ }
+
if (auto_downloads)
{
mAction = CONTENT_ACTION_OPEN;