diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-persist.cpp | 9 |
2 files changed, 15 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2005-05-06 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/mozilla-embed-persist.cpp: + + Use nsICancelable. + +2005-05-06 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/mozilla-embed-single.cpp: Use new way to add user agent info. Fixes bug #173000. diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp index b9f3e690c..06733ddbe 100644 --- a/embed/mozilla/mozilla-embed-persist.cpp +++ b/embed/mozilla/mozilla-embed-persist.cpp @@ -40,6 +40,7 @@ #include <nsIDOMSerializer.h> #include <nsIIOService.h> #include <nsNetCID.h> +#include <nsNetError.h> static void mozilla_embed_persist_class_init (MozillaEmbedPersistClass *klass); @@ -122,10 +123,18 @@ impl_cancel (EphyEmbedPersist *persist) { nsCOMPtr<nsIWebBrowserPersist> bpersist = MOZILLA_EMBED_PERSIST (persist)->priv->mPersist; +#ifdef HAVE_GECKO_1_8 + nsCOMPtr<nsICancelable> cancelable (do_QueryInterface (bpersist)); + if (cancelable) + { + cancelable->Cancel (NS_BINDING_ABORTED); + } +#else if (bpersist) { bpersist->CancelSave (); } +#endif g_object_unref (persist); } |