Remove unused variables, and adjust some MOZILLA_SNAPSHOT checks.

2004-05-07  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/ContentHandler.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/mozilla-embed.cpp:

	Remove unused variables, and adjust some MOZILLA_SNAPSHOT checks.

7 files changed, 14 insertions, 22 deletions

diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index a1436f9b1..33458e269 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -57,7 +57,7 @@ class GContentHandler;
 
 NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog)
 
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 GContentHandler::GContentHandler() : mMimeType(nsnull)
 {
 	LOG ("GContentHandler ctor (%p)", this)
@@ -73,7 +73,7 @@ GContentHandler::~GContentHandler()
 {
 	LOG ("GContentHandler dtor (%p)", this)
 
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 	nsMemory::Free (mMimeType);
 #endif
 }
@@ -102,7 +102,7 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
 	NS_ENSURE_SUCCESS (rv, rv);
 
 	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 	g_signal_emit_by_name (single, "handle_content", mMimeType,
 			       mUrl.get(), &handled);
 #else
@@ -185,7 +185,6 @@ NS_METHOD GContentHandler::ShowProgressDialog(nsIHelperAppLauncher *aLauncher,
 
 NS_METHOD GContentHandler::LaunchHelperApp (void)
 {
-	nsresult rv;
 	nsCOMPtr<nsIExternalHelperAppService> helperService;
 
 	helperService = do_GetService (NS_EXTERNALHELPERAPPSERVICE_CONTRACTID);
@@ -243,7 +242,7 @@ NS_METHOD GContentHandler::Init (void)
 	mLauncher->GetMIMEInfo (getter_AddRefs(MIMEInfo));
 	NS_ENSURE_TRUE (MIMEInfo, NS_ERROR_FAILURE);
 
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 	rv = MIMEInfo->GetMIMEType (&mMimeType);
 #else
 	rv = MIMEInfo->GetMIMEType (mMimeType);
@@ -362,21 +361,20 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
 
 NS_METHOD GContentHandler::MIMEDoAction (void)
 {
-	nsresult rv;
 	gboolean auto_downloads;
 
 	if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) return NS_OK;
 
 	auto_downloads = eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS);
 
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 	mHelperApp = gnome_vfs_mime_get_default_application (mMimeType);
 #else
 	mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get());
 #endif
 	CheckAppSupportScheme ();
 
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 	mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType);
 #else
 	mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType.get());
@@ -410,7 +408,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 		/* HACK we use the application description to ask
 		   MozDownload to open the file when download
 		   is finished */
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 		mimeInfo->SetApplicationDescription
 			(NS_LITERAL_STRING ("gnome-default").get());
 #else
@@ -420,7 +418,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 	}
 	else
 	{
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 		mimeInfo->SetApplicationDescription (nsnull);
 #else
 		mimeInfo->SetApplicationDescription (NS_LITERAL_STRING (""));
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index 3d850d9c6..8893769cf 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -21,6 +21,10 @@
 #ifndef __ContentHandler_h
 #define __ContentHandler_h
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ephy-embed-shell.h"
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -82,7 +86,7 @@ class GContentHandler : public nsIHelperAppLauncherDialog
 	nsCOMPtr<nsIFile> mTempFile;
 	nsCOMPtr<nsISupports> mContext;
 
-#if MOZILLA_SNAPSHOT < 16
+#if MOZILLA_SNAPSHOT < 18
 	char *mMimeType;
 #else
 	nsCString mMimeType;
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 5a1cb95dc..7ad661b5e 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -400,8 +400,6 @@ nsresult EphyBrowser::Destroy ()
 
 nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index)
 {
-	nsresult result;
-
 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
 
 	nsCOMPtr<nsIWebNavigation> ContentNav = do_QueryInterface (mWebBrowser);
@@ -616,8 +614,6 @@ nsresult EphyBrowser::Find (PRBool backwards,
 
 nsresult EphyBrowser::GetPageDescriptor(nsISupports **aPageDescriptor)
 {
-	nsresult rv;
-
 	NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
 
 	nsCOMPtr<nsIDocShell> ds = do_GetInterface (mWebBrowser);
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 07a50e77f..2d043fb14 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -231,7 +231,6 @@ filechooser_response_cb (EphyFileChooser *dialog, gint response, EphyHeaderSniff
 nsresult EphyHeaderSniffer::PerformSave (nsIURI* inOriginalURI)
 {
 	nsresult rv;
-	char *path, *download_dir;
 	EmbedPersistFlags flags;
 	PRBool askDownloadDest;
 
@@ -354,7 +353,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));
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 43ff14e00..e8a945291 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -145,7 +145,6 @@ nsresult EventContext::GatherTextUnder (nsIDOMNode* aNode, nsString& aResult)
 
 nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
 {
-	nsresult rv;
 #if MOZILLA_SNAPSHOT > 13
 	nsIURI *base;
 	base = doc->GetBaseURI ();
@@ -169,7 +168,6 @@ nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl
 
 nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
 {
-	nsresult rv;
 #if MOZILLA_SNAPSHOT > 13
 	nsIURI *uri;
 	uri = doc->GetDocumentURI ();
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index d2354ecd9..f4dd9687d 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -114,7 +114,6 @@ MozDownload::Init(nsIURI *aSource, nsIURI *aTarget, const PRUnichar *aDisplayNam
 #endif
 {
 	PRBool addToView = PR_TRUE;
-	nsresult rv;
 
 	if (mEmbedPersist)
 	{
@@ -605,7 +604,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);
 
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index ca0508f4c..baf8ce15b 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -294,7 +294,6 @@ static void
 mozilla_embed_destroy (GtkObject *object)
 {
 	MozillaEmbed *embed = MOZILLA_EMBED (object);
-	int i;
 
 	if (embed->priv->browser)
 	{