diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-03-13 05:38:55 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-03-13 05:38:55 +0800 |
| commit | fdffd322181be333e39c2a039e37295587cf3284 (patch) | |
| tree | 5f90f0b38e4ff1e91e87b4d38e43080b5bb022c2 /embed/mozilla/ContentHandler.cpp | |
| parent | 40174913b001abad51dd5a4d4c0ce142b0ace2f9 (diff) | |
| download | gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.gz gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.bz2 gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.lz gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.xz gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.zst gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.zip | |
Try again to fix the directory provider for 1.9. Branding still fails though
svn path=/trunk/; revision=8101
Diffstat (limited to 'embed/mozilla/ContentHandler.cpp')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index c70f460c2..b7ba3b43f 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -416,6 +416,14 @@ NS_METHOD GContentHandler::MIMEDoAction (void) mLauncher->GetMIMEInfo(getter_AddRefs(mimeInfo)); NS_ENSURE_TRUE (mimeInfo, NS_ERROR_FAILURE); +#ifdef HAVE_GECKO_1_9 + nsHandlerInfoAction action; + if (mAction == CONTENT_ACTION_DOWNLOAD) { + action = EPHY_ACTION_BROWSE_TO_FILE; + } else { + action = nsIMIMEInfo::useSystemDefault; + } +#else char *info = NULL; if (mAction == CONTENT_ACTION_OPEN) @@ -435,8 +443,6 @@ NS_METHOD GContentHandler::MIMEDoAction (void) info = g_strdup_printf ("gnome-browse-to-file:%d", gtk_get_current_event_time()); } - /* See http://bugzilla.gnome.org/show_bug.cgi?id=456945 */ -#ifndef HAVE_GECKO_1_9 if (info != NULL) { nsString desc; |