aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-04-13 22:18:01 +0800
committerMilan Crha <mcrha@redhat.com>2012-04-13 22:18:01 +0800
commit7c1a7df115abbfe389d224c9adc3261c3eb771da (patch)
treed99baba02409f79ec33068dff683f36300443196 /modules
parent2f530637b15a2a07bd1df1aabef91ffc4f26ddee (diff)
downloadgsoc2013-evolution-7c1a7df115abbfe389d224c9adc3261c3eb771da.tar.gz
gsoc2013-evolution-7c1a7df115abbfe389d224c9adc3261c3eb771da.tar.zst
gsoc2013-evolution-7c1a7df115abbfe389d224c9adc3261c3eb771da.zip
Bug #600860 - Opening IMAP message with large attachment blocks UI
Diffstat (limited to 'modules')
-rw-r--r--modules/calendar/e-cal-attachment-handler.c4
-rw-r--r--modules/mail/e-mail-attachment-handler.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index 604bc737da..3b18f426aa 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -75,6 +75,10 @@ attachment_handler_get_component (EAttachment *attachment)
if (component != NULL)
return component;
+ if (e_attachment_get_loading (attachment) ||
+ e_attachment_get_saving (attachment))
+ return NULL;
+
mime_part = e_attachment_get_mime_part (attachment);
if (!CAMEL_IS_MIME_PART (mime_part))
return NULL;
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 00f416c564..b3e14328e4 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -444,6 +444,11 @@ mail_attachment_handler_update_actions (EAttachmentView *view,
goto exit;
attachment = E_ATTACHMENT (selected->data);
+
+ if (e_attachment_get_loading (attachment) ||
+ e_attachment_get_saving (attachment))
+ goto exit;
+
mime_part = e_attachment_get_mime_part (attachment);
if (!CAMEL_IS_MIME_PART (mime_part))