aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-05-16 19:21:22 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:16 +0800
commitfb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef (patch)
tree688e65dd1ed2b623b1c7255c612d2259f307ff68 /modules/mail
parent42580e1802fce5e83008c6c79d64ea2a9bedafe9 (diff)
downloadgsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.tar
gsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.tar.gz
gsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.tar.bz2
gsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.tar.lz
gsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.tar.xz
gsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.tar.zst
gsoc2013-evolution-fb38e4a4ba22026cd4524ca6bb3c35bb2cdba0ef.zip
Bug #601541 - Add 'Copy Image' Option On Inline Email Images
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-view-private.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 55357fae11..8cc7d45c85 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -326,6 +326,7 @@ mail_shell_view_popup_event_cb (EMailShellView *mail_shell_view,
const gchar *uri)
{
EMailShellContent *mail_shell_content;
+ EMFormatHTML *html_formatter;
EShellView *shell_view;
EMailReader *reader;
EMailView *mail_view;
@@ -338,8 +339,12 @@ mail_shell_view_popup_event_cb (EMailShellView *mail_shell_view,
mail_view = e_mail_shell_content_get_mail_view (mail_shell_content);
reader = E_MAIL_READER (mail_view);
- menu = e_mail_reader_get_popup_menu (reader);
+ html_formatter = e_mail_reader_get_formatter (reader);
+
+ if (html_formatter && e_web_view_get_cursor_image (em_format_html_get_web_view (html_formatter)) != NULL)
+ return FALSE;
+ menu = e_mail_reader_get_popup_menu (reader);
shell_view = E_SHELL_VIEW (mail_shell_view);
e_shell_view_update_actions (shell_view);