diff options
| author | Xan Lopez <xan@src.gnome.org> | 2003-08-11 02:02:00 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2003-08-11 02:02:00 +0800 |
| commit | 0c4262113d6a47834308ad6c35d0302f3d7d8c31 (patch) | |
| tree | 746ff726e7858a5cad64f3768c6020fbda54155f | |
| parent | f4b6554560c4fefaf936eafddb66b9d5186dfa88 (diff) | |
| download | gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.tar gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.tar.gz gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.tar.bz2 gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.tar.lz gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.tar.xz gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.tar.zst gsoc2013-epiphany-0c4262113d6a47834308ad6c35d0302f3d7d8c31.zip | |
Sync with Moz HEAD.
Sync with Moz HEAD.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 7 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2003-08-10 Xan Lopez <xan@masilla.org> + + * configure.in: + * embed/mozilla/ContentHandler.cpp: + + Sync with Moz HEAD. + 2003-08-10 Marco Pesenti Gritti <marco@it.gnome.org> * NEWS: diff --git a/configure.in b/configure.in index c30396153..b4fea771e 100644 --- a/configure.in +++ b/configure.in @@ -156,8 +156,8 @@ AC_MSG_RESULT($MOZILLA_VERSION$autodetect) case "$MOZILLA_VERSION" in 1.4) MOZILLA_SNAPSHOT=8 ;; 1.5a) MOZILLA_SNAPSHOT=9 ;; - 1.5b) MOZILLA_SNAPSHOT=9 ;; -trunk) MOZILLA_SNAPSHOT=9 ;; + 1.5b) MOZILLA_SNAPSHOT=10 ;; +trunk) MOZILLA_SNAPSHOT=10 ;; *) 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 332456b71..b020ee5d0 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -272,8 +272,11 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher, } /* nsILocalFile promptForSaveToFile (in nsISupports aWindowContext, in wstring aDefaultFile, in wstring aSuggestedFileExtension); */ -NS_IMETHODIMP GContentHandler:: - PromptForSaveToFile(nsISupports *aWindowContext, +NS_IMETHODIMP GContentHandler::PromptForSaveToFile( +#if MOZILLA_SNAPSHOT > 9 + nsIHelperAppLauncher *aLauncher, +#endif + nsISupports *aWindowContext, const PRUnichar *aDefaultFile, const PRUnichar *aSuggestedFileExtension, nsILocalFile **_retval) |