From f467a03305ba1e11655e417fc5714837027f0bd5 Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sat, 27 Sep 2003 13:22:39 +0000 Subject: API sync, from galeon. API sync, from galeon. --- ChangeLog | 7 +++++++ configure.in | 4 ++-- embed/mozilla/ContentHandler.cpp | 14 +++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7ca40927..ac1a257ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-09-27 Xan Lopez + + * configure.in: + * embed/mozilla/ContentHandler.cpp: + + API sync, from galeon. + 2003-09-26 Marco Pesenti Gritti * src/ephy-window.c: diff --git a/configure.in b/configure.in index 6d19cb45d..11a2ad6df 100644 --- a/configure.in +++ b/configure.in @@ -161,8 +161,8 @@ case "$MOZILLA_VERSION" in 1.4.1) MOZILLA_SNAPSHOT=9 ;; 1.5a) MOZILLA_SNAPSHOT=10 ;; 1.5b) MOZILLA_SNAPSHOT=11 ;; - 1.6a) MOZILLA_SNAPSHOT=11 ;; -trunk) MOZILLA_SNAPSHOT=11 ;; + 1.6a) MOZILLA_SNAPSHOT=12 ;; +trunk) MOZILLA_SNAPSHOT=12 ;; *) AC_ERROR([ ***************************************************************************** Epiphany can be built using Mozilla 1.4, 1.5a, 1.5b or diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index de122f65a..4e19d312d 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -494,18 +494,18 @@ NS_METHOD GContentHandler::Init (void) rv = mLauncher->GetMIMEInfo (getter_AddRefs(MIMEInfo)); rv = MIMEInfo->GetMIMEType (&mMimeType); +#if MOZILLA_SNAPSHOT > 11 + rv = mLauncher->GetSource(getter_AddRefs(mUri)); + rv = mLauncher->GetTargetFile(getter_AddRefs(mTempFile)); +#else rv = mLauncher->GetDownloadInfo(getter_AddRefs(mUri), &mTimeDownloadStarted, getter_AddRefs(mTempFile)); +#endif + rv = mUri->GetSpec (mUrl); rv = mUri->GetScheme (mScheme); -#if 0 - /* GetSource seems redundant and isn't in 0.9 This code is here while - it remains unclear what GetSource is for. --phil */ - nsCOMPtr uri; - rv = mLauncher->GetSource(getter_AddRefs(uri)); - rv = uri->GetSpec (mUrl); -#endif + ProcessMimeInfo (); return NS_OK; -- cgit v1.2.3