aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2004-04-30 06:42:52 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-04-30 06:42:52 +0800
commit37b6cdee54a229d78f9c955ddd8e5c395ef32155 (patch)
treeb4bc6702f66012bef698552070c6a3569879ff95 /embed
parent43dbdc1eb7b96e4672d0d3bd68f01fd65f1690b7 (diff)
downloadgsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.tar
gsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.tar.gz
gsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.tar.bz2
gsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.tar.lz
gsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.tar.xz
gsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.tar.zst
gsoc2013-epiphany-37b6cdee54a229d78f9c955ddd8e5c395ef32155.zip
fix build bustage
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp4
-rw-r--r--embed/mozilla/FilePicker.cpp4
-rw-r--r--embed/mozilla/MozDownload.cpp10
3 files changed, 18 insertions, 0 deletions
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 3c4073c75..f34fe1407 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -68,6 +68,10 @@
#include <nsIDownload.h>
#include <nsIMIMEHeaderParam.h>
+#ifdef ALLOW_PRIVATE_STRINGS
+#include <nsReadableUtils.h>
+#endif
+
EphyHeaderSniffer::EphyHeaderSniffer (nsIWebBrowserPersist* aPersist, MozillaEmbedPersist *aEmbedPersist,
nsIFile* aFile, nsIURI* aURL, nsIDOMDocument* aDocument, nsIInputStream* aPostData)
: mPersist(aPersist)
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 188cae460..540d58cae 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -314,7 +314,11 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
NS_ConvertUCS2toUTF8 (aDefaultString).get())
#endif
+#if MOZILLA_SNAPSHOT < 16
+ if (aDefaultString)
+#else
if (aDefaultString.Length())
+#endif
{
/* set_current_name takes UTF-8, not a filename */
#if MOZILLA_SNAPSHOT < 16
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 4c60d424d..79e25c8c0 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -86,7 +86,11 @@ NS_IMPL_ISUPPORTS3(MozDownload, nsIDownload, nsITransfer, nsIWebProgressListener
#endif
NS_IMETHODIMP
+#if MOZILLA_SNAPSHOT < 16
+MozDownload::InitForEmbed (nsIURI *aSource, nsILocalFile *aTarget, const PRUnichar *aDisplayName,
+#else
MozDownload::InitForEmbed (nsIURI *aSource, nsIURI *aTarget, const PRUnichar *aDisplayName,
+#endif
nsIMIMEInfo *aMIMEInfo, PRInt64 startTime, nsIWebBrowserPersist *aPersist,
MozillaEmbedPersist *aEmbedPersist, PRInt32 aMaxSize)
{
@@ -527,12 +531,18 @@ nsresult InitiateMozillaDownload (nsIDOMDocument *domDocument, nsIURI *sourceURI
nsAutoString fileDisplayName;
inDestFile->GetLeafName(fileDisplayName);
+ #if MOZILLA_SNAPSHOT >= 16
nsCOMPtr<nsIURI> destURI;
NS_NewFileURI (getter_AddRefs(destURI), inDestFile);
+ #endif
MozDownload *downloader = new MozDownload ();
/* dlListener attaches to its progress dialog here, which gains ownership */
+ #if MOZILLA_SNAPSHOT < 16
+ rv = downloader->InitForEmbed (inOriginalURI, inDestFile, fileDisplayName.get(),
+ #else
rv = downloader->InitForEmbed (inOriginalURI, destURI, fileDisplayName.get(),
+ #endif
nsnull, timeNow, webPersist, embedPersist, aMaxSize);
NS_ENSURE_SUCCESS (rv, rv);