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.

1 files changed, 8 insertions, 10 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 (""));