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.

2 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6780c88a1..18f8b9999 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
+
+2005-08-13  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
 
 	Reject favicons that are < 12x12.
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;