aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2003-09-27 20:19:57 +0800
committerXan Lopez <xan@src.gnome.org>2003-09-27 20:19:57 +0800
commitc76f68d03f940f25534cc20e90bf5354a5a2227c (patch)
tree919b3773c2b76e5464ae4e3d89b6154603652619
parent87719c053d95cc1bf2cce252d75caa60852bf53b (diff)
downloadgsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.tar
gsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.tar.gz
gsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.tar.bz2
gsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.tar.lz
gsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.tar.xz
gsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.tar.zst
gsoc2013-epiphany-c76f68d03f940f25534cc20e90bf5354a5a2227c.zip
API sync, from galeon.
API sync, from galeon.
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/ContentHandler.cpp16
2 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 61bdb147c..149ab6644 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-27 Xan Lopez <xan@masilla.org>
+
+ * configure.in:
+ * embed/mozilla/ContentHandler.cpp:
+
+ API sync, from galeon.
+
2003-09-27 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-bookmarks-editor.c: (cmd_bookmarks_import):
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 49152e586..48809a099 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -493,19 +493,19 @@ NS_METHOD GContentHandler::Init (void)
nsCOMPtr<nsIMIMEInfo> MIMEInfo;
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<nsIURI> uri;
- rv = mLauncher->GetSource(getter_AddRefs(uri));
- rv = uri->GetSpec (mUrl);
-#endif
+
ProcessMimeInfo ();
return NS_OK;