aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-04-17 19:12:15 +0800
committerChristian Persch <chpe@src.gnome.org>2005-04-17 19:12:15 +0800
commit62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba (patch)
treee07eecb2c4817c6d046f3a60c797ef540937195a /embed
parent44532e7b137fc3f5d81677003ce53cf8017e825f (diff)
downloadgsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.tar
gsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.tar.gz
gsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.tar.bz2
gsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.tar.lz
gsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.tar.xz
gsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.tar.zst
gsoc2013-epiphany-62572e9e1ac7ec9d470b454f6aa04c8aa3d6d2ba.zip
Mozilla API change.
2005-04-17 Christian Persch <chpe@cvs.gnome.org> * configure.ac: * embed/mozilla/ContentHandler.cpp: Mozilla API change.
Diffstat (limited to 'embed')
-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
{