aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-25 21:23:48 +0800
committerChristian Persch <chpe@src.gnome.org>2004-09-25 21:23:48 +0800
commit8409f7b2cadd1a3c913803636c7645e09cb1d482 (patch)
tree9518c99d16ee5fc188b02ac63959eb38a3523ac2 /embed
parentfca87d8f89a3e9d5476113d3700f91b395baf164 (diff)
downloadgsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.tar
gsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.tar.gz
gsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.tar.bz2
gsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.tar.lz
gsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.tar.xz
gsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.tar.zst
gsoc2013-epiphany-8409f7b2cadd1a3c913803636c7645e09cb1d482.zip
Mozilla API changes.
2004-09-25 Christian Persch <chpe@cvs.gnome.org> * configure.in: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/mozilla-embed-single.cpp: Mozilla API changes.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/GlobalHistory.cpp5
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp13
2 files changed, 16 insertions, 2 deletions
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index c2ba7a1ae..e46af14cd 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -43,8 +43,13 @@ MozGlobalHistory::~MozGlobalHistory ()
{
}
+#ifdef MOZ_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER
+/* void addURI (in nsIURI aURI, in boolean aRedirect, in boolean aToplevel, in nsIURI aReferrer); */
+NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aToplevel, nsIURI *aReferrer)
+#else
/* void addURI (in nsIURI aURI, in boolean aRedirect, in boolean aToplevel); */
NS_IMETHODIMP MozGlobalHistory::AddURI(nsIURI *aURI, PRBool aRedirect, PRBool aToplevel)
+#endif
{
nsresult rv;
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 025d3347d..08d0995b8 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -71,9 +71,14 @@
#include <nsIPassword.h>
#endif
+#if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
+#include <chrome/nsIChromeRegistrySea.h>
+#elif defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN)
+#include <nsIChromeRegistry.h>
+#endif
+
#ifdef ALLOW_PRIVATE_API
// FIXME: For setting the locale. hopefully gtkmozembed will do itself soon
-#include <nsIChromeRegistry.h>
#include <nsILocaleService.h>
#include <nsIHttpAuthManager.h>
#include <nsICacheService.h>
@@ -404,11 +409,15 @@ static nsresult
mozilla_init_chrome (void)
{
/* FIXME: can we just omit this on new-toolkit ? */
-#ifdef MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN
+#if defined(MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN) || defined(HAVE_CHROME_NSICHROMEREGISTRYSEA_H)
nsresult rv;
nsEmbedString uiLang;
+#ifdef HAVE_CHROME_NSICHROMEREGISTRYSEA_H
+ nsCOMPtr<nsIChromeRegistrySea> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID);
+#else
nsCOMPtr<nsIXULChromeRegistry> chromeRegistry = do_GetService (NS_CHROMEREGISTRY_CONTRACTID);
+#endif
NS_ENSURE_TRUE (chromeRegistry, NS_ERROR_FAILURE);
// Set skin to 'classic' so we get native scrollbars.