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.

1 files changed, 17 insertions, 16 deletions

diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index ab96b0d14..819afe9a3 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -34,19 +34,22 @@
 
 #include "MozillaPrivate.h"
 
-#include "nsIX509Cert.h"
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIX509CertValidity.h"
-#include "nsIX509CertDB.h"
-#include "nsIASN1Object.h"
-#include "nsIASN1Sequence.h"
-#include "nsICRLInfo.h"
-#include "nsISimpleEnumerator.h"
-#include "nsIArray.h"
-#include "nsReadableUtils.h"
+#include <nsCOMPtr.h>
+#include <nsIServiceManager.h>
+#include <nsIInterfaceRequestor.h>
+#include <nsIInterfaceRequestorUtils.h>
+#include <nsIX509Cert.h>
+#include <nsIX509CertValidity.h>
+#include <nsIX509CertDB.h>
+#include <nsIASN1Object.h>
+#include <nsIASN1Sequence.h>
+#include <nsICRLInfo.h>
+#include <nsISimpleEnumerator.h>
+#include <nsIArray.h>
+
+#ifdef ALLOW_PRIVATE_STRINGS
+#include <nsReadableUtils.h>
+#endif
 
 #include <gconf/gconf-client.h>
 #include <gtk/gtkdialog.h>
@@ -70,16 +73,14 @@
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtkprogressbar.h>
-
 #include <libgnome/gnome-i18n.h>
+#include <time.h>
 
 #include "GtkNSSDialogs.h"
 #include "ephy-file-helpers.h"
 #include "ephy-glade.h"
 #include "ephy-gui.h"
 
-#include <time.h>
-
 NS_DEFINE_CID (kX509CertCID, NS_IX509CERT_IID);
 NS_DEFINE_CID (kASN1ObjectCID, NS_IASN1OBJECT_IID);