diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 9 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2005-04-17 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * embed/mozilla/ContentHandler.cpp: + + Mozilla API change. + 2005-04-13 Christian Persch <chpe@cvs.gnome.org> * configure.ac: diff --git a/configure.ac b/configure.ac index 493072730..61c55541b 100644 --- a/configure.ac +++ b/configure.ac @@ -445,6 +445,13 @@ AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h], [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h], [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])])]) +dnl exists since 1.8b2 + +AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsICancelable.h], + [AC_DEFINE([HAVE_NSICANCELABLE_H],[1],[Define if nsICancelable.h exists])], + [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/necko/nsICancelable.h], + [AC_DEFINE([HAVE_NSICANCELABLE_H],[1],[Define if nsICancelable.h exists])])]) + dnl check for broken reload in GtkMozEmbed dnl This is fixed since 1.7.4 on 1.7 branch, and since 1.8a3 on trunk 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 { |