aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla/mozilla-embed.cpp
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-04-29 18:41:10 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-04-29 18:41:10 +0800
commit25d492ed43d4bb06fe9e1589950d2a349917bce2 (patch)
treec193c6890bf4401a597c8bd796f4709c2f5bf67a /embed/mozilla/mozilla-embed.cpp
parent4bc8882e3270c7bd044ae32984686343ddc89cad (diff)
downloadgsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.gz
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.bz2
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.lz
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.xz
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.tar.zst
gsoc2013-epiphany-25d492ed43d4bb06fe9e1589950d2a349917bce2.zip
More defines work, still lack EventContext and EmbedPrivate. Use mozilla
2004-04-29 Marco Pesenti Gritti <marco@gnome.org> * configure.in: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * embed/mozilla/EphyAboutRedirector.cpp: * embed/mozilla/EphyAboutRedirector.h: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyContentPolicy.cpp: * embed/mozilla/EphyContentPolicy.h: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/EphyHeaderSniffer.h: * embed/mozilla/EphySingle.cpp: * embed/mozilla/EventContext.cpp: * embed/mozilla/FilePicker.cpp: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/GlobalHistory.h: * embed/mozilla/GtkNSSClientAuthDialogs.cpp: * embed/mozilla/GtkNSSClientAuthDialogs.h: * embed/mozilla/GtkNSSDialogs.cpp: * embed/mozilla/GtkNSSDialogs.h: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: * embed/mozilla/GtkNSSKeyPairDialogs.h: * embed/mozilla/Makefile.am: * embed/mozilla/MozDownload.cpp: * embed/mozilla/MozDownload.h: * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed.cpp: More defines work, still lack EventContext and EmbedPrivate. Use mozilla like warning flags instead of those gnome macros. Remove several unused variables.
Diffstat (limited to 'embed/mozilla/mozilla-embed.cpp')
-rw-r--r--embed/mozilla/mozilla-embed.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 444e8bfc5..30d825f5f 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -34,17 +34,23 @@
#include "EventContext.h"
#include <gtkmozembed.h>
-#include <nsIWindowWatcher.h>
#include <nsIURI.h>
#include <nsIURL.h>
-#include <nsNetUtil.h>
-#include <nsString.h>
#include <nsIRequest.h>
#include <nsIWebProgressListener.h>
-#include <nsITransportSecurityInfo.h>
#include <nsIPrintOptions.h>
#include <nsGfxCIID.h>
+#ifdef ALLOW_PRIVATE_API
+/* not sure about this one */
+#include <nsITransportSecurityInfo.h>
+#endif
+
+#ifdef ALLOW_PRIVATE_STRINGS
+#include <nsNetUtil.h>
+#include <nsString.h>
+#endif
+
static void mozilla_embed_class_init (MozillaEmbedClass *klass);
static void mozilla_embed_init (MozillaEmbed *gs);
static void mozilla_embed_destroy (GtkObject *object);