diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2004-04-29 18:41:10 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-04-29 18:41:10 +0800 |
| commit | 25d492ed43d4bb06fe9e1589950d2a349917bce2 (patch) | |
| tree | c193c6890bf4401a597c8bd796f4709c2f5bf67a /embed/mozilla/mozilla-embed-single.cpp | |
| parent | 4bc8882e3270c7bd044ae32984686343ddc89cad (diff) | |
| download | gsoc2013-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-single.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 9435a7203..693c39bec 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -43,17 +43,12 @@ #include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-utils.h> -#include <nsICacheService.h> + #include <nsCOMPtr.h> #include <nsIPrefService.h> -#include <nsNetCID.h> #include <nsIServiceManager.h> #include <nsIIOService.h> -#include <nsIProtocolProxyService.h> -#include <nsIAtom.h> -#include <nsIFontEnumerator.h> #include <nsISupportsPrimitives.h> -#include <nsReadableUtils.h> #include <nsICookieManager.h> #include <nsIPassword.h> #include <nsIPasswordManager.h> @@ -63,15 +58,24 @@ #include <nsCPasswordManager.h> #include <nsIPermission.h> #include <nsIPermissionManager.h> -#include <nsString.h> #include <nsILocalFile.h> #include <nsIURI.h> -#include <nsNetUtil.h> -#include <nsIHttpAuthManager.h> +#ifdef ALLOW_PRIVATE_API // FIXME: For setting the locale. hopefully gtkmozembed will do itself soon #include <nsIChromeRegistry.h> #include <nsILocaleService.h> +#include <nsIProtocolProxyService.h> +#include <nsIHttpAuthManager.h> +#include <nsICacheService.h> +#include <nsIFontEnumerator.h> +#endif + +#ifdef ALLOW_PRIVATE_STRINGS +#include <nsString.h> +#include <nsReadableUtils.h> +#include <nsNetUtil.h> +#endif #define MOZILLA_PROFILE_DIR "/mozilla" #define MOZILLA_PROFILE_NAME "epiphany" |