Index: configure.ac
===================================================================
RCS file: /cvs/gnome/epiphany/configure.ac,v
retrieving revision 1.75
diff -p -u -u -p -r1.75 configure.ac
--- configure.ac	21 Mar 2005 22:01:06 -0000	1.75
+++ configure.ac	6 Apr 2005 13:14:07 -0000
@@ -260,6 +260,6 @@ dnl **********************************
 
 dnl FIXME find a m4/autoconf guru who can distill this into a nice macro
 
-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` -DMOZILLA_STRICT_API"
+CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom`"
 CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $MOZILLA-xpcom`"
 
@ -497,6 +499,11 @@ CPPFLAGS=$_SAVE_CPPFLAGS
 CXXFLAGS=$_SAVE_CXXFLAGS
 
 AC_LANG_POP([C++])
+
+dnl Needed since 1.8b2
+dnl Define this down here so it doesn't affect the API checks above
+
+AC_DEFINE([MOZILLA_INTERNAL_API],[1],[Define for access to internal mozilla API])
 
 dnl Not a simple file check due to the header being in the SDK since 1.8a6
 dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068
Index: embed/mozilla/ContentHandler.h
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/ContentHandler.h,v
retrieving revision 1.27
diff -p -u -u -p -r1.27 ContentHandler.h
--- embed/mozilla/ContentHandler.h	26 Feb 2005 22:01:48 -0000	1.27
+++ embed/mozilla/ContentHandler.h	6 Apr 2005 13:14:08 -0000
@@ -28,9 +28,9 @@
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
 
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsCOMPtr.h>
 #include <nsISupports.h>
 #include <nsIURI.h>
Index: embed/mozilla/EphyBrowser.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyBrowser.cpp,v
retrieving revision 1.76
diff -p -u -u -p -r1.76 EphyBrowser.cpp
--- embed/mozilla/EphyBrowser.cpp	28 Jan 2005 22:23:38 -0000	1.76
+++ embed/mozilla/EphyBrowser.cpp	6 Apr 2005 13:14:08 -0000
@@ -70,9 +70,9 @@
 #include "nsIDOMWindow2.h"
 #include "nsIDOMDocumentView.h"
 #include "nsIDOMAbstractView.h"
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include "nsEmbedString.h"
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include "nsMemory.h"
 #include "nsIChannel.h"
 #include "nsIScriptSecurityManager.h"
Index: embed/mozilla/EphyContentPolicy.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyContentPolicy.cpp,v
retrieving revision 1.14
diff -p -u -u -p -r1.14 EphyContentPolicy.cpp
--- embed/mozilla/EphyContentPolicy.cpp	28 Jan 2005 22:23:38 -0000	1.14
+++ embed/mozilla/EphyContentPolicy.cpp	6 Apr 2005 13:14:08 -0000
@@ -32,9 +32,9 @@
 
 #include <nsCOMPtr.h>
 #include <nsIURI.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 #define CONF_LOCKDOWN_DISABLE_UNSAFE_PROTOCOLS	"/apps/epiphany/lockdown/disable_unsafe_protocols"
 #define CONF_LOCKDOWN_ADDITIONAL_SAFE_PROTOCOLS	"/apps/epiphany/lockdown/additional_safe_protocols"
Index: embed/mozilla/EphyHeaderSniffer.h
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyHeaderSniffer.h,v
retrieving revision 1.14
diff -p -u -u -p -r1.14 EphyHeaderSniffer.h
--- embed/mozilla/EphyHeaderSniffer.h	13 Nov 2004 19:53:38 -0000	1.14
+++ embed/mozilla/EphyHeaderSniffer.h	6 Apr 2005 13:14:09 -0000
@@ -50,9 +50,9 @@
 #include <nsIDOMDocument.h>
 #include <nsIAuthPrompt.h>
 #include <nsIPromptService.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 class EphyHeaderSniffer : public nsIWebProgressListener,
 			  public nsIAuthPrompt
Index: embed/mozilla/EphyHistoryListener.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyHistoryListener.cpp,v
retrieving revision 1.4
diff -p -u -u -p -r1.4 EphyHistoryListener.cpp
--- embed/mozilla/EphyHistoryListener.cpp	28 Jan 2005 22:23:38 -0000	1.4
+++ embed/mozilla/EphyHistoryListener.cpp	6 Apr 2005 13:14:09 -0000
@@ -27,9 +27,9 @@
 
 #include "ephy-debug.h"
 
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsCOMPtr.h>
 #include <nsIServiceManager.h>
 #include <nsIDocumentLoader.h>
Index: embed/mozilla/EphySidebar.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphySidebar.cpp,v
retrieving revision 1.3
diff -p -u -u -p -r1.3 EphySidebar.cpp
--- embed/mozilla/EphySidebar.cpp	14 Feb 2005 20:57:07 -0000	1.3
+++ embed/mozilla/EphySidebar.cpp	6 Apr 2005 13:14:09 -0000
@@ -27,9 +27,9 @@
 #include <nsCRT.h>
 #include <nsIProgrammingLanguage.h>
 
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 #include "EphySidebar.h"
 #include "ephy-embed-shell.h"
Index: embed/mozilla/EphySingle.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphySingle.cpp,v
retrieving revision 1.22
diff -p -u -u -p -r1.22 EphySingle.cpp
--- embed/mozilla/EphySingle.cpp	28 Jan 2005 22:23:38 -0000	1.22
+++ embed/mozilla/EphySingle.cpp	6 Apr 2005 13:14:09 -0000
@@ -27,9 +27,9 @@
 
 #include "ephy-debug.h"
 
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsIURI.h>
 #include <nsIPermissionManager.h>
 #include <nsICookieManager.h>
Index: embed/mozilla/EphyUtils.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyUtils.cpp,v
retrieving revision 1.8
diff -p -u -u -p -r1.8 EphyUtils.cpp
--- embed/mozilla/EphyUtils.cpp	2 Dec 2004 15:16:41 -0000	1.8
+++ embed/mozilla/EphyUtils.cpp	6 Apr 2005 13:14:09 -0000
@@ -28,9 +28,9 @@
 #include "print-dialog.h"
 
 #include <nsIServiceManager.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsIWindowWatcher.h>
 #include <nsIEmbeddingSiteWindow.h>
 #include <nsIWebBrowserChrome.h>
Index: embed/mozilla/EventContext.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EventContext.cpp,v
retrieving revision 1.50
diff -p -u -u -p -r1.50 EventContext.cpp
--- embed/mozilla/EventContext.cpp	27 Feb 2005 14:13:45 -0000	1.50
+++ embed/mozilla/EventContext.cpp	6 Apr 2005 13:14:09 -0000
@@ -31,9 +31,9 @@
 
 #include <nsIInterfaceRequestor.h>
 #include <nsIServiceManager.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsIDOMEventTarget.h>
 #include <nsIDOMHTMLInputElement.h>
 #include <nsIDOMHTMLObjectElement.h>
Index: embed/mozilla/FilePicker.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/FilePicker.cpp,v
retrieving revision 1.51
diff -p -u -u -p -r1.51 FilePicker.cpp
--- embed/mozilla/FilePicker.cpp	28 Jan 2005 22:23:38 -0000	1.51
+++ embed/mozilla/FilePicker.cpp	6 Apr 2005 13:14:11 -0000
@@ -27,9 +27,9 @@
 #include "EphyUtils.h"
 
 #include <nsCOMPtr.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsIServiceManager.h>
 #include <nsIURI.h>
 #include <nsIFileURL.h>
Index: embed/mozilla/FilePicker.h
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/FilePicker.h,v
retrieving revision 1.9
diff -p -u -u -p -r1.9 FilePicker.h
--- embed/mozilla/FilePicker.h	13 Nov 2004 19:53:38 -0000	1.9
+++ embed/mozilla/FilePicker.h	6 Apr 2005 13:14:12 -0000
@@ -24,9 +24,9 @@
 
 #include <nsIFilePicker.h>
 #include <nsISupports.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 #include "ephy-file-chooser.h"
 
Index: embed/mozilla/GlobalHistory.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/GlobalHistory.cpp,v
retrieving revision 1.34
diff -p -u -u -p -r1.34 GlobalHistory.cpp
--- embed/mozilla/GlobalHistory.cpp	9 Jan 2005 15:06:36 -0000	1.34
+++ embed/mozilla/GlobalHistory.cpp	6 Apr 2005 13:14:12 -0000
@@ -28,9 +28,9 @@
 #include "GlobalHistory.h"
 
 #include <nsIURI.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 NS_IMPL_ISUPPORTS1 (MozGlobalHistory, nsIGlobalHistory2)
 
Index: embed/mozilla/GtkNSSClientAuthDialogs.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/GtkNSSClientAuthDialogs.cpp,v
retrieving revision 1.22
diff -p -u -u -p -r1.22 GtkNSSClientAuthDialogs.cpp
--- embed/mozilla/GtkNSSClientAuthDialogs.cpp	28 Jan 2005 22:23:38 -0000	1.22
+++ embed/mozilla/GtkNSSClientAuthDialogs.cpp	6 Apr 2005 13:14:12 -0000
@@ -29,9 +29,9 @@
 #include <nsIServiceManager.h>
 #include <nsIInterfaceRequestor.h>
 #include <nsIInterfaceRequestorUtils.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkimage.h>
Index: embed/mozilla/GtkNSSDialogs.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/GtkNSSDialogs.cpp,v
retrieving revision 1.27
diff -p -u -u -p -r1.27 GtkNSSDialogs.cpp
--- embed/mozilla/GtkNSSDialogs.cpp	15 Jan 2005 20:08:06 -0000	1.27
+++ embed/mozilla/GtkNSSDialogs.cpp	6 Apr 2005 13:14:12 -0000
@@ -45,9 +45,9 @@
 #include <nsICRLInfo.h>
 #include <nsISimpleEnumerator.h>
 #include <nsIArray.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 
 #include <gconf/gconf-client.h>
 #include <gtk/gtkdialog.h>
Index: embed/mozilla/MozDownload.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/MozDownload.cpp,v
retrieving revision 1.66
diff -p -u -u -p -r1.66 MozDownload.cpp
--- embed/mozilla/MozDownload.cpp	23 Mar 2005 13:24:54 -0000	1.66
+++ embed/mozilla/MozDownload.cpp	6 Apr 2005 13:14:12 -0000
@@ -57,9 +57,9 @@
 #include <glib/gi18n.h>
 
 #include <nsIFileURL.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsMemory.h>
 
 #include <errno.h>
Index: embed/mozilla/mozilla-download.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/mozilla-download.cpp,v
retrieving revision 1.19
diff -p -u -u -p -r1.19 mozilla-download.cpp
--- embed/mozilla/mozilla-download.cpp	28 Jan 2005 22:23:38 -0000	1.19
+++ embed/mozilla/mozilla-download.cpp	6 Apr 2005 13:14:12 -0000
@@ -26,9 +26,9 @@
 
 #include "ephy-debug.h"
 
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsMemory.h>
 
 static void mozilla_download_class_init	(MozillaDownloadClass *klass);
Index: embed/mozilla/mozilla-embed-single.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/mozilla-embed-single.cpp,v
retrieving revision 1.110
diff -p -u -u -p -r1.110 mozilla-embed-single.cpp
--- embed/mozilla/mozilla-embed-single.cpp	10 Mar 2005 15:50:36 -0000	1.110
+++ embed/mozilla/mozilla-embed-single.cpp	6 Apr 2005 13:14:13 -0000
@@ -49,9 +49,9 @@
 
 #include <nsCOMPtr.h>
 #include <nsMemory.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>
 #include <nsIWindowWatcher.h>
Index: embed/mozilla/mozilla-embed.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/mozilla-embed.cpp,v
retrieving revision 1.101
diff -p -u -u -p -r1.101 mozilla-embed.cpp
--- embed/mozilla/mozilla-embed.cpp	31 Jan 2005 13:53:05 -0000	1.101
+++ embed/mozilla/mozilla-embed.cpp	6 Apr 2005 13:14:13 -0000
@@ -36,9 +36,9 @@
 #include "EphyUtils.h"
 
 #include <gtkmozembed.h>
-#define MOZILLA_STRICT_API
+#undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
-#undef MOZILLA_STRICT_API
+#define MOZILLA_INTERNAL_API 1
 #include <nsMemory.h>
 #include <nsIURI.h>
 #include <nsIRequest.h>