aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog24
-rw-r--r--configure.ac2
-rw-r--r--embed/mozilla/ContentHandler.h2
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyContentPolicy.cpp2
-rw-r--r--embed/mozilla/EphyHeaderSniffer.h2
-rw-r--r--embed/mozilla/EphySingle.cpp2
-rw-r--r--embed/mozilla/EphyUtils.cpp2
-rw-r--r--embed/mozilla/EventContext.cpp2
-rw-r--r--embed/mozilla/FilePicker.cpp2
-rw-r--r--embed/mozilla/FilePicker.h2
-rw-r--r--embed/mozilla/GlobalHistory.cpp2
-rw-r--r--embed/mozilla/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp2
-rw-r--r--embed/mozilla/MozDownload.cpp2
-rw-r--r--embed/mozilla/mozilla-download.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp2
20 files changed, 61 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f592cda4..583724a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2004-11-13 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+ * embed/mozilla/ContentHandler.h:
+ * embed/mozilla/EphyAboutRedirector.cpp:
+ * embed/mozilla/EphyBrowser.cpp:
+ * embed/mozilla/EphyContentPolicy.cpp:
+ * embed/mozilla/EphyHeaderSniffer.h:
+ * embed/mozilla/EphySingle.cpp:
+ * embed/mozilla/EphyUtils.cpp:
+ * embed/mozilla/EventContext.cpp:
+ * embed/mozilla/FilePicker.cpp:
+ * embed/mozilla/FilePicker.h:
+ * embed/mozilla/GlobalHistory.cpp:
+ * embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+ * embed/mozilla/GtkNSSDialogs.cpp:
+ * embed/mozilla/MozDownload.cpp:
+ * embed/mozilla/mozilla-download.cpp:
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * embed/mozilla/mozilla-embed.cpp:
+ * embed/mozilla/mozilla-notifiers.cpp:
+
+ nsEmbedString.h now requires MOZILLA_STRICT_API define.
+
2004-11-12 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-tab.c: (ephy_tab_size_allocate), (ephy_tab_map):
diff --git a/configure.ac b/configure.ac
index 394ed60e3..f53df1038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,7 +215,7 @@ dnl **********************************
dnl FIXME find a m4/autoconf guru who can distill this into a nice macro
-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom` -DMOZILLA_STRICT_API"
dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index f2126ecab..95ba1aa4d 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -31,7 +31,9 @@
#include <nsISupports.h>
#include <nsIURI.h>
#include <nsIFile.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIHelperAppLauncherDialog.h>
typedef enum
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp
index ee863f9f9..e5b879ed6 100644
--- a/embed/mozilla/EphyAboutRedirector.cpp
+++ b/embed/mozilla/EphyAboutRedirector.cpp
@@ -50,7 +50,9 @@
#include <nsIServiceManager.h>
#include <nsCOMPtr.h>
#include <nsIURI.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index ac39d2f86..6e87868f5 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -63,7 +63,9 @@
#include "nsIDOMNode.h"
#include "nsIDOMElement.h"
#include "nsIDOMWindow2.h"
+#define MOZILLA_STRICT_API
#include "nsEmbedString.h"
+#undef MOZILLA_STRICT_API
#include "nsMemory.h"
#include "nsIChannel.h"
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index b024cee4d..5eb2e5404 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -30,7 +30,9 @@
#include <nsCOMPtr.h>
#include <nsIURI.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#define CONF_LOCKDOWN_DISABLE_UNSAFE_PROTOCOLS "/apps/epiphany/lockdown/disable_unsafe_protocols"
#define CONF_LOCKDOWN_ADDITIONAL_SAFE_PROTOCOLS "/apps/epiphany/lockdown/additional_safe_protocols"
diff --git a/embed/mozilla/EphyHeaderSniffer.h b/embed/mozilla/EphyHeaderSniffer.h
index f58bebe01..309bbaf41 100644
--- a/embed/mozilla/EphyHeaderSniffer.h
+++ b/embed/mozilla/EphyHeaderSniffer.h
@@ -50,7 +50,9 @@
#include <nsIDOMDocument.h>
#include <nsIAuthPrompt.h>
#include <nsIPromptService.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
class EphyHeaderSniffer : public nsIWebProgressListener,
public nsIAuthPrompt
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index eada250ee..29deaa230 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -27,7 +27,9 @@
#include "ephy-debug.h"
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIURI.h>
#include <nsIPermissionManager.h>
#include <nsICookieManager.h>
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 545910e8f..89354b499 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -27,7 +27,9 @@
#include "ephy-embed-single.h"
#include <nsIServiceManager.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIWindowWatcher.h>
#include <nsIEmbeddingSiteWindow.h>
#include <nsIWebBrowserChrome.h>
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 1424a0670..604a5096f 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -31,7 +31,9 @@
#include <nsIInterfaceRequestor.h>
#include <nsIServiceManager.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIDOMEventTarget.h>
#include <nsIDOMHTMLInputElement.h>
#include <nsIDOMHTMLObjectElement.h>
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 2fa055d49..88825d0a9 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -27,7 +27,9 @@
#include "EphyUtils.h"
#include <nsCOMPtr.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIServiceManager.h>
#include <nsIURI.h>
#include <nsIFileURL.h>
diff --git a/embed/mozilla/FilePicker.h b/embed/mozilla/FilePicker.h
index a0578a860..bc88d5b61 100644
--- a/embed/mozilla/FilePicker.h
+++ b/embed/mozilla/FilePicker.h
@@ -24,7 +24,9 @@
#include <nsIFilePicker.h>
#include <nsISupports.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include "ephy-file-chooser.h"
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 47bc68987..315685329 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -28,7 +28,9 @@
#include "GlobalHistory.h"
#include <nsIURI.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory2, nsIBrowserHistory)
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 657f35474..cd1ee2fb9 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -31,7 +31,9 @@
#include <nsIServiceManager.h>
#include <nsIInterfaceRequestor.h>
#include <nsIInterfaceRequestorUtils.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <gtk/gtkdialog.h>
#include <gtk/gtkimage.h>
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index f4c313699..40876ffdf 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -47,7 +47,9 @@
#include <nsICRLInfo.h>
#include <nsISimpleEnumerator.h>
#include <nsIArray.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <gconf/gconf-client.h>
#include <gtk/gtkdialog.h>
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 1160bfa2b..48b7cf79f 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -57,7 +57,9 @@
#include <glib/gi18n.h>
#include <nsIFileURL.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
const char* const persistContractID = "@mozilla.org/embedding/browser/nsWebBrowserPersist;1";
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index d6c5b1a0d..5db2a74f7 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -26,7 +26,9 @@
#include "ephy-debug.h"
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsMemory.h>
static void mozilla_download_class_init (MozillaDownloadClass *klass);
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index db8c57438..24c9cf32e 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -49,7 +49,9 @@
#include <nsCOMPtr.h>
#include <nsMemory.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIPrefService.h>
#include <nsIServiceManager.h>
#include <nsIWindowWatcher.h>
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 7422c2325..c00fc26ab 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -35,7 +35,9 @@
#include "EphyUtils.h"
#include <gtkmozembed.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsMemory.h>
#include <nsIURI.h>
#include <nsIRequest.h>
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 9bc057f14..83a028ffb 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -42,7 +42,9 @@
#include <gtk/gtksettings.h>
#include <nsCOMPtr.h>
+#define MOZILLA_STRICT_API
#include <nsEmbedString.h>
+#undef MOZILLA_STRICT_API
#include <nsIPrefService.h>
#include <nsIServiceManager.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 05:08:50 +0800