diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2003-11-06 18:36:39 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-11-06 18:36:39 +0800 |
| commit | 510dc2f81c7d5da00ae321c4f87fe74bc7873e0d (patch) | |
| tree | dc55cc4838c34ad069a5464271a3cd17621bf3f3 /embed/mozilla/ContentHandler.cpp | |
| parent | 665035daca3b08898e1d838d38c65fbe5f36ff95 (diff) | |
| download | gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.tar gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.tar.gz gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.tar.bz2 gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.tar.lz gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.tar.xz gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.tar.zst gsoc2013-epiphany-510dc2f81c7d5da00ae321c4f87fe74bc7873e0d.zip | |
Correct download dir default.
2003-11-06 Marco Pesenti Gritti <marco@gnome.org>
* data/epiphany.schemas.in:
Correct download dir default.
* embed/ephy-embed-shell.h:
* embed/ephy-embed-shell.c: (ephy_embed_shell_init),
(ephy_embed_shell_finalize), (ephy_embed_shell_get_encodings),
(load_mime_from_xml), (ephy_embed_shell_check_mime):
Add check_mime api for permissions.
* embed/mozilla/ContentHandler.cpp:
First incomplete try at using it.
Diffstat (limited to 'embed/mozilla/ContentHandler.cpp')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 17c6685c3..742db0319 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -35,6 +35,7 @@ #include "ephy-prefs.h" #include "eel-gconf-extensions.h" +#include "ephy-embed-shell.h" #include <libgnomevfs/gnome-vfs-mime.h> #include <libgnomevfs/gnome-vfs-utils.h> @@ -342,11 +343,16 @@ NS_METHOD GContentHandler::MIMEAskAction (void) nsresult rv; gboolean auto_open; + /* FIXME can we assume mime is not NULL ? */ + auto_open = eel_gconf_get_boolean (CONF_AUTO_OPEN_DOWNLOADS); GContentHandler *mContentHandler = this; GnomeVFSMimeApplication *DefaultApp = gnome_vfs_mime_get_default_application(mMimeType); + + EphyMimePermission permission; + permission = ephy_embed_shell_check_mime (embed_shell, mMimeType); - if (!auto_open || !DefaultApp) + if (!auto_open || !DefaultApp || permission != EPHY_MIME_PERMISSION_SAFE) { nsCOMPtr<nsIHelperAppLauncher> launcher; |