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, 5 insertions, 9 deletions

diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 2dd99e98d..4c60d424d 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -55,14 +55,11 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <glib/gi18n.h>
 
-#include "nsIExternalHelperAppService.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsDirectoryServiceUtils.h"
-#include "nsIRequest.h"
-#include "nsIMIMEInfo.h"
-#include "nsIFileURL.h"
-#include "netCore.h"
+#include <nsIFileURL.h>
+
+#ifdef ALLOW_PRIVATE_STRINGS
 #include "nsNetUtil.h"
+#endif
 
 const char* const persistContractID = "@mozilla.org/embedding/browser/nsWebBrowserPersist;1";
 
@@ -110,7 +107,6 @@ MozDownload::Init(nsIURI *aSource, nsIURI *aTarget, const PRUnichar *aDisplayNam
 #endif
 {
 	PRBool addToView = PR_TRUE;
-	nsresult rv;
 
 	if (mEmbedPersist)
 	{
@@ -597,7 +593,7 @@ static char*
 GetFilePath (const char *filename)
 {
 	char *path = NULL;
-	char *download_dir, *converted_dp, *expanded, *tmp;
+	char *download_dir, *converted_dp, *expanded;
 
 	download_dir = eel_gconf_get_string (CONF_STATE_DOWNLOAD_DIR);