From a6dfa12b0587d65d8015fbaef94fce453db10148 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Fri, 6 May 2005 18:15:29 +0000
Subject: Use nsICancelable.

2005-05-06  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/mozilla-embed-persist.cpp:

	Use nsICancelable.
---
 embed/mozilla/mozilla-embed-persist.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'embed')

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);
 }
-- 
cgit v1.2.3