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, 10 insertions, 16 deletions

diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 9ee7d1ce1..3c4073c75 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -44,10 +44,8 @@
 #endif
 
 #include "MozillaPrivate.h"
-
 #include "MozDownload.h"
 #include "EphyHeaderSniffer.h"
-#include "netCore.h"
 
 #include "ephy-embed-single.h"
 #include "ephy-embed-shell.h"
@@ -57,21 +55,19 @@
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
 
-#include "nsReadableUtils.h"
-#include "nsIChannel.h"
-#include "nsIHttpChannel.h"
-#include "nsIURL.h"
-#include "nsIStringEnumerator.h"
-#include "nsIPrefService.h"
-#include "nsIMIMEService.h"
-#include "nsIMIMEInfo.h"
-#include "nsIDOMHTMLDocument.h"
-#include "nsIDownload.h"
-#include  "nsIMIMEHeaderParam.h"
-
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
+#include <nsIChannel.h>
+#include <nsIHttpChannel.h>
+#include <nsIURL.h>
+#include <nsIPrefService.h>
+#include <nsIMIMEService.h>
+#include <nsIMIMEInfo.h>
+#include <nsIDOMHTMLDocument.h>
+#include <nsIDownload.h>
+#include <nsIMIMEHeaderParam.h>
+
 EphyHeaderSniffer::EphyHeaderSniffer (nsIWebBrowserPersist* aPersist, MozillaEmbedPersist *aEmbedPersist,
 		nsIFile* aFile, nsIURI* aURL, nsIDOMDocument* aDocument, nsIInputStream* aPostData)
 : mPersist(aPersist)
@@ -229,7 +225,6 @@ filechooser_response_cb (EphyFileChooser *dialog, gint response, EphyHeaderSniff
 nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
 {
 	nsresult rv;
-	char *path, *download_dir;
 	EmbedPersistFlags flags;
 	PRBool askDownloadDest;
 
@@ -337,7 +332,6 @@ nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
 		EphyFileChooser *dialog;
 		GtkWindow *window;
 		const char *title;
-		int response;
 
 		title = ephy_embed_persist_get_fc_title (EPHY_EMBED_PERSIST (mEmbedPersist));
 		window = ephy_embed_persist_get_fc_parent (EPHY_EMBED_PERSIST (mEmbedPersist));