diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2003-12-15 00:19:40 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2003-12-15 00:19:40 +0800 |
| commit | deab0d1c914913ae0615eec1cd1dc170255275a5 (patch) | |
| tree | da652af5a61920e256db92e2aa8a1d22bfebac7d /embed/mozilla/EphyWrapper.cpp | |
| parent | f21911f22afd1bb0838010ac61fe3c3297657098 (diff) | |
| download | gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.gz gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.bz2 gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.lz gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.xz gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.tar.zst gsoc2013-epiphany-deab0d1c914913ae0615eec1cd1dc170255275a5.zip | |
Adapt to changed mozilla APIs for 1.6. (Ported from HEAD).
2003-12-14 Christian Persch <chpe@cvs.gnome.org>
* NEWS:
* configure.in:
* embed/mozilla/EphyEventListener.cpp:
* embed/mozilla/EphyWrapper.cpp:
* embed/mozilla/EventContext.cpp:
* embed/mozilla/ExternalProtocolService.cpp:
* embed/mozilla/MozRegisterComponents.cpp:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-single.cpp:
* src/ephy-window.c: (show_embed_popup):
Adapt to changed mozilla APIs for 1.6. (Ported from HEAD).
Diffstat (limited to 'embed/mozilla/EphyWrapper.cpp')
| -rw-r--r-- | embed/mozilla/EphyWrapper.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp index 63908dc5d..daf1648b6 100644 --- a/embed/mozilla/EphyWrapper.cpp +++ b/embed/mozilla/EphyWrapper.cpp @@ -16,6 +16,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "EphyWrapper.h" #include "GlobalHistory.h" #include "ProgressListener.h" @@ -68,6 +72,7 @@ #include "nsIPresContext.h" #include "ContentHandler.h" #include "EphyEventListener.h" +#include "nsPromiseFlatString.h" EphyWrapper::EphyWrapper () { @@ -582,8 +587,13 @@ nsresult EphyWrapper::GetMainDocumentUrl (nsCString &url) nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument); if(!doc) return NS_ERROR_FAILURE; +#if MOZILLA_SNAPSHOT > 11 + nsIURI *uri; + uri = doc->GetDocumentURL (); +#else nsCOMPtr<nsIURI> uri; doc->GetDocumentURL(getter_AddRefs(uri)); +#endif if (!uri) return NS_ERROR_FAILURE; return uri->GetSpec (url); @@ -601,8 +611,13 @@ nsresult EphyWrapper::GetDocumentUrl (nsCString &url) nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument); if(!doc) return NS_ERROR_FAILURE; - nsCOMPtr<nsIURI> uri; +#if MOZILLA_SNAPSHOT > 11 + nsIURI *uri; + uri = doc->GetDocumentURL (); +#else + nsCOMPtr<nsIURI> uri; doc->GetDocumentURL(getter_AddRefs(uri)); +#endif if (!uri) return NS_ERROR_FAILURE; return uri->GetSpec (url); |