From ce6e072e9619efd9ac093080ad33ad2bbe6bf604 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sat, 25 Sep 2004 13:22:27 +0000
Subject: Mozilla API changes.

2004-09-25  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* embed/mozilla/GlobalHistory.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:

	Mozilla API changes.
---
 embed/mozilla/mozilla-embed-single.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'embed/mozilla/mozilla-embed-single.cpp')

diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index d4262b1cd..9525b5fa2 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.
-- 
cgit