diff options
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 6 | ||||
| -rw-r--r-- | embed/mozilla/EphyWrapper.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/EventContext.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 505a58f62..71c921ba8 100644 --- a/configure.in +++ b/configure.in @@ -160,9 +160,10 @@ AC_MSG_RESULT($MOZILLA_VERSION$autodetect) case "$MOZILLA_VERSION" in 1.4) MOZILLA_SNAPSHOT=8 ;; - 1.5a) MOZILLA_SNAPSHOT=9 ;; - 1.5b) MOZILLA_SNAPSHOT=10 ;; -trunk) MOZILLA_SNAPSHOT=10 ;; +1.4.1) MOZILLA_SNAPSHOT=9 ;; + 1.5a) MOZILLA_SNAPSHOT=10 ;; + 1.5b) MOZILLA_SNAPSHOT=11 ;; +trunk) MOZILLA_SNAPSHOT=11 ;; *) 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 b020ee5d0..12724907c 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -246,7 +246,7 @@ GContentHandler::~GContentHandler() // begin nsIHelperAppLauncher impl //////////////////////////////////////////////////////////////////////////////// -#if MOZILLA_SNAPSHOT > 8 +#if MOZILLA_SNAPSHOT > 9 /* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, nsISupports *aContext, @@ -273,7 +273,7 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, /* nsILocalFile promptForSaveToFile (in nsISupports aWindowContext, in wstring aDefaultFile, in wstring aSuggestedFileExtension); */ NS_IMETHODIMP GContentHandler::PromptForSaveToFile( -#if MOZILLA_SNAPSHOT > 9 +#if MOZILLA_SNAPSHOT > 10 nsIHelperAppLauncher *aLauncher, #endif nsISupports *aWindowContext, @@ -343,7 +343,7 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile( } } -#if MOZILLA_SNAPSHOT < 9 +#if MOZILLA_SNAPSHOT < 10 /* void showProgressDialog (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */ NS_METHOD GContentHandler::ShowProgressDialog(nsIHelperAppLauncher *aLauncher, nsISupports *aContext) diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp index 72ec50323..8bd7051d4 100644 --- a/embed/mozilla/EphyWrapper.cpp +++ b/embed/mozilla/EphyWrapper.cpp @@ -685,7 +685,7 @@ nsresult EphyWrapper::ForceEncoding (const char *encoding) &result); if (NS_FAILED(result) || !mdv) return NS_ERROR_FAILURE; -#if MOZILLA_SNAPSHOT > 8 +#if MOZILLA_SNAPSHOT > 9 result = mdv->SetForceCharacterSet (nsDependentCString(encoding)); #else result = mdv->SetForceCharacterSet (NS_ConvertUTF8toUCS2(encoding).get()); diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp index 7c30839d0..651c13118 100644 --- a/embed/mozilla/EventContext.cpp +++ b/embed/mozilla/EventContext.cpp @@ -140,7 +140,7 @@ nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl { nsresult rv; nsCOMPtr<nsIURI> base; -#if MOZILLA_SNAPSHOT > 8 +#if MOZILLA_SNAPSHOT > 9 rv = doc->GetBaseURL (getter_AddRefs(base)); #else rv = doc->GetBaseURL (*getter_AddRefs(base)); diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 4cee89bd5..9188a4dfb 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -180,7 +180,7 @@ encodings[] = { N_("R_omanian (ISO-8859-16)"), "ISO-8859-16", LG_OTHER }, { N_("South _European (ISO-8859-3)"), "ISO-8859-3", LG_OTHER }, { N_("Thai (TIS-_620)"), "TIS-620", LG_OTHER }, -#if MOZILLA_SNAPSHOT >= 9 +#if MOZILLA_SNAPSHOT >= 10 { N_("Thai (IS_O-8859-11)"), "iso-8859-11", LG_OTHER }, { N_("_Thai (Windows-874)"), "windows-874", LG_OTHER }, #endif |