diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-01 00:09:40 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-01 00:09:40 +0800 |
| commit | 9b8959a4de1dc5eacdf807ae6d311defce4fad51 (patch) | |
| tree | 88ac3f23c1b1024b3b6d7101bbc6712ebd943e74 /embed/mozilla | |
| parent | ddf12994065314b103f57969640845d7344974f2 (diff) | |
| download | gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.tar gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.tar.gz gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.tar.bz2 gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.tar.lz gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.tar.xz gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.tar.zst gsoc2013-epiphany-9b8959a4de1dc5eacdf807ae6d311defce4fad51.zip | |
Move mime permission checks to ephy-file-helpers.
2004-12-31 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed-shell.c: (ephy_embed_shell_finalize),
(ephy_embed_shell_get_encodings):
* embed/ephy-embed-shell.h:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* lib/ephy-file-helpers.c: (ephy_file_helpers_shutdown),
(ephy_file_delete_on_exit), (load_mime_from_xml),
(ephy_file_check_mime):
* lib/ephy-file-helpers.h:
Move mime permission checks to ephy-file-helpers.
* src/popup-commands.c: (image_open_uri),
(save_source_completed_cb), (popup_cmd_open_image):
Only open the image if its mime type is 'safe'.
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/ContentHandler.cpp | 5 | ||||
| -rw-r--r-- | embed/mozilla/ContentHandler.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 14a3438ec..0b7f2f653 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -49,6 +49,7 @@ #include "ephy-embed-single.h" #include "ephy-embed-shell.h" #include "ephy-file-chooser.h" +#include "ephy-file-helpers.h" #include "ephy-stock-icons.h" #include "ephy-gui.h" #include "ephy-debug.h" @@ -326,10 +327,10 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void) #ifdef MOZ_NSIMIMEINFO_NSACSTRING_ mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get()); - mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType.get()); + mPermission = ephy_file_check_mime (mMimeType.get()); #else mHelperApp = gnome_vfs_mime_get_default_application (mMimeType); - mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType); + mPermission = ephy_file_check_mime (mMimeType); #endif if (auto_downloads) diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 9f11bb67a..3401a68cb 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -24,7 +24,7 @@ #include "config.h" -#include "ephy-embed-shell.h" +#include "ephy-file-helpers.h" #include <libgnomevfs/gnome-vfs-mime-handlers.h> |