diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-11-17 06:38:52 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-11-17 06:38:52 +0800 |
| commit | 48e8a2fc2d439ac02dcf85a33db4f78c236372c6 (patch) | |
| tree | fcd77b4a2520bf7b691fe9eb3b274848739c684d /embed | |
| parent | 863dbbd51155943debb458d19bdf7f946da909eb (diff) | |
| download | gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.tar gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.tar.gz gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.tar.bz2 gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.tar.lz gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.tar.xz gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.tar.zst gsoc2013-epiphany-48e8a2fc2d439ac02dcf85a33db4f78c236372c6.zip | |
More cruft exorcised.
2004-11-16 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
More cruft exorcised.
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 35 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 4 |
2 files changed, 4 insertions, 35 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index dd8da8d23..3b3905d70 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -182,31 +182,6 @@ NS_IMETHODIMP GContentHandler::PromptForSaveToFile( } } -NS_METHOD GContentHandler::LaunchHelperApp (void) -{ - nsCOMPtr<nsIExternalHelperAppService> helperService; - - helperService = do_GetService (NS_EXTERNALHELPERAPPSERVICE_CONTRACTID); - NS_ENSURE_TRUE (helperService, NS_ERROR_FAILURE); - - nsCOMPtr<nsPIExternalAppLauncher> appLauncher = do_QueryInterface (helperService); - NS_ENSURE_TRUE (appLauncher, NS_ERROR_FAILURE); - appLauncher->DeleteTemporaryFileOnExit(mTempFile); - - GList *params = NULL; - char *param; - - param = gnome_vfs_make_uri_canonical (mUrl.get()); - params = g_list_append (params, param); - gnome_vfs_mime_application_launch (mHelperApp, params); - g_free (param); - g_list_free (params); - - mLauncher->Cancel(); - - return NS_OK; -} - NS_METHOD GContentHandler::Init (void) { nsresult rv; @@ -223,13 +198,11 @@ NS_METHOD GContentHandler::Init (void) rv = MIMEInfo->GetMIMEType (&mMimeType); #endif - mLauncher->GetTargetFile (getter_AddRefs(mTempFile)); - - mLauncher->GetSource (getter_AddRefs(mUri)); - NS_ENSURE_TRUE (mUri, NS_ERROR_FAILURE); + nsCOMPtr<nsIURI> uri; + mLauncher->GetSource (getter_AddRefs(uri)); + NS_ENSURE_TRUE (uri, NS_ERROR_FAILURE); - rv = mUri->GetSpec (mUrl); - rv = mUri->GetScheme (mScheme); + uri->GetSpec (mUrl); return NS_OK; } diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 0f0378d79..06698ba22 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -67,14 +67,11 @@ class GContentHandler : public nsIHelperAppLauncherDialog private: NS_METHOD Init (); - NS_METHOD LaunchHelperApp (); NS_METHOD MIMEConfirmAction (); NS_METHOD MIMEDoAction (); nsCOMPtr<nsIHelperAppLauncher> mLauncher; - nsCOMPtr<nsIURI> mUri; - nsCOMPtr<nsIFile> mTempFile; nsCOMPtr<nsISupports> mContext; PRBool mAppSupportScheme; @@ -83,7 +80,6 @@ class GContentHandler : public nsIHelperAppLauncherDialog EphyMimePermission mPermission; nsEmbedCString mUrl; - nsEmbedCString mScheme; #ifdef MOZ_NSIMIMEINFO_NSACSTRING_ nsEmbedCString mMimeType; #else |