aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/ContentHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla/ContentHandler.cpp')
-rw-r--r--embed/mozilla/ContentHandler.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 4a7cc996d..d13114a95 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -43,6 +43,7 @@
#include <nsIMIMEInfo.h>
#include <nsIInterfaceRequestorUtils.h>
#include <nsCExternalHandlerService.h>
+#include <nsNetError.h>
#ifdef ALLOW_PRIVATE_API
#include <nsIServiceManager.h>
@@ -133,7 +134,11 @@ GContentHandler::Show (nsIHelperAppLauncher *aLauncher,
}
else
{
+#ifdef HAVE_NSICANCELABLE_H
+ mLauncher->Cancel (NS_BINDING_ABORTED);
+#else
mLauncher->Cancel ();
+#endif
}
return NS_OK;
@@ -440,7 +445,11 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
}
else if (mAction == CONTENT_ACTION_NONE)
{
+#ifdef HAVE_NSICANCELABLE_H
+ mLauncher->Cancel (NS_BINDING_ABORTED);
+#else
mLauncher->Cancel ();
+#endif
}
else
{