aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-14 02:51:05 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-14 02:51:05 +0800
commit53889e7853182f20e4271dc711f622dae19de95d (patch)
treed1e11c3863712690ad6ef3dc7d54d8b301355dae /embed
parent75e3a3834d9e9cf9524bb2528ee8c9f1a41babf9 (diff)
downloadgsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.tar
gsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.tar.gz
gsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.tar.bz2
gsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.tar.lz
gsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.tar.xz
gsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.tar.zst
gsoc2013-epiphany-53889e7853182f20e4271dc711f622dae19de95d.zip
Check that we're not trying to open in Epiphany itself! Fixes bug #310023.PRE_GNOME_2_14_BRANCHPOINT
2005-08-13 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/ContentHandler.cpp: Check that we're not trying to open in Epiphany itself! Fixes bug #310023.
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;