diff options
Diffstat (limited to 'embed/mozilla/ContentHandler.cpp')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index f980c692c..8e46348fb 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 } @@ -97,7 +97,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 @@ -226,7 +226,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); @@ -344,14 +344,14 @@ NS_METHOD GContentHandler::MIMEDoAction (void) 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()); @@ -385,7 +385,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 @@ -395,7 +395,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void) } else { -#if MOZILLA_SNAPSHOT < 16 +#if MOZILLA_SNAPSHOT < 18 mimeInfo->SetApplicationDescription (nsnull); #else mimeInfo->SetApplicationDescription (NS_LITERAL_STRING ("")); |