3 files changed, 36 insertions, 6 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 8f0267d33..dc4382943 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -73,17 +73,26 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
 				    nsISupports *aContext)
 #endif
 {
-	/* aForced reflects if the content being sent is normally viewable
-	 * in mozilla or not. That fact doesn't affect us, so ignore it
-         */
-
 	nsresult rv;
+	EphyEmbedSingle *single;
+	gboolean handled = FALSE;
 
 	mLauncher = aLauncher;
 	rv = Init ();
 	if (NS_FAILED (rv)) return rv;
-	
-	MIMEAskAction ();
+
+	single = ephy_embed_shell_get_embed_single (embed_shell);
+	g_signal_emit_by_name (single, "handle_content", mMimeType,
+			       mUrl.get(), &handled);
+
+	if (!handled)
+	{
+		MIMEAskAction ();
+	}
+	else
+	{
+		mLauncher->Cancel ();
+	}
 
 	return NS_OK;
 }
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 0b353112b..a1e621fad 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -91,6 +91,23 @@ EphyHeaderSniffer::~EphyHeaderSniffer()
 
 NS_IMPL_ISUPPORTS2(EphyHeaderSniffer, nsIWebProgressListener, nsIAuthPrompt)
 
+NS_IMETHODIMP
+EphyHeaderSniffer::HandleContent ()
+{
+	EphyEmbedSingle *single;
+	gboolean handled = FALSE;
+	nsCString uriSpec;
+
+	if (mPostData) return NS_ERROR_FAILURE;
+
+	mURL->GetSpec (uriSpec);	
+	single = ephy_embed_shell_get_embed_single (embed_shell);
+	g_signal_emit_by_name (single, "handle_content", mContentType.get(),
+			       uriSpec.get(), &handled);
+
+	return handled ? NS_OK : NS_ERROR_FAILURE;
+}
+
 NS_IMETHODIMP 
 EphyHeaderSniffer::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 aStateFlags, 
                                   PRUint32 aStatus)
@@ -126,6 +143,9 @@ EphyHeaderSniffer::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aReq
 			mTmpFile->Remove(PR_FALSE);
 		}
 
+		rv = HandleContent ();
+		if (NS_SUCCEEDED (rv)) return NS_OK;
+
 		rv = PerformSave(origURI);
 		if (NS_FAILED(rv))
 		{
diff --git a/embed/mozilla/EphyHeaderSniffer.h b/embed/mozilla/EphyHeaderSniffer.h
index 8d5d6f0d3..45a3b0f91 100644
--- a/embed/mozilla/EphyHeaderSniffer.h
+++ b/embed/mozilla/EphyHeaderSniffer.h
@@ -65,6 +65,7 @@ public:
 
 protected:
 	nsresult PerformSave (nsIURI* inOriginalURI);
+	nsresult HandleContent ();
 
 private:
 	nsIWebBrowserPersist*      mPersist; /* Weak. It owns us as a listener. */