aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchenthill@novell.com>2009-12-28 21:12:28 +0800
committerChenthill Palanisamy <pchenthill@novell.com>2009-12-28 21:14:09 +0800
commit6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0 (patch)
tree8dc7acf0ca7bff50ece62f1c95db2493deb15a23 /widgets
parent32bc83c91d575d7258252a9c532309e8e9015d84 (diff)
downloadgsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.tar
gsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.tar.gz
gsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.tar.bz2
gsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.tar.lz
gsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.tar.xz
gsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.tar.zst
gsoc2013-evolution-6a72dacb7db51cd0f6b84e9aefd248677c0ff4e0.zip
Bug 361145 - Evolution hangs when formatting message - fixes part of it.
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/e-attachment.c16
-rw-r--r--widgets/misc/e-attachment.h2
2 files changed, 7 insertions, 11 deletions
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 44dd467967..f8b93f9fc2 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -400,8 +400,8 @@ attachment_update_progress_columns (EAttachment *attachment)
-1);
}
-static void
-attachment_set_file_info (EAttachment *attachment,
+void
+e_attachment_set_file_info (EAttachment *attachment,
GFileInfo *file_info)
{
GtkTreeRowReference *reference;
@@ -1560,7 +1560,7 @@ attachment_load_finish (LoadContext *load_context)
/* Correctly report the size of zero length special files. */
if (g_file_info_get_size (file_info) == 0) {
g_file_info_set_size (file_info, size);
- attachment_set_file_info (attachment, file_info);
+ e_attachment_set_file_info (attachment, file_info);
}
g_simple_async_result_set_op_res_gpointer (
@@ -1708,7 +1708,7 @@ attachment_load_query_info_cb (GFile *file,
if (attachment_load_check_for_error (load_context, error))
return;
- attachment_set_file_info (attachment, file_info);
+ e_attachment_set_file_info (attachment, file_info);
load_context->file_info = file_info;
load_context->total_num_bytes = g_file_info_get_size (file_info);
@@ -1730,7 +1730,6 @@ attachment_load_from_mime_part (LoadContext *load_context)
const gchar *attribute;
const gchar *string;
gchar *allocated;
- goffset size;
attachment = load_context->attachment;
mime_part = e_attachment_get_mime_part (attachment);
@@ -1785,15 +1784,10 @@ attachment_load_from_mime_part (LoadContext *load_context)
g_file_info_set_attribute_string (
file_info, attribute, string);
- /* FIXME This can cause Camel to block while downloading the
- * MIME part in order to determine the content size. */
- size = (goffset) camel_mime_part_get_content_size (mime_part);
- g_file_info_set_size (file_info, size);
-
string = camel_mime_part_get_disposition (mime_part);
e_attachment_set_disposition (attachment, string);
- attachment_set_file_info (attachment, file_info);
+ e_attachment_set_file_info (attachment, file_info);
camel_object_ref (mime_part);
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index d7cfb5be06..d2a31c45af 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -81,6 +81,8 @@ GFile * e_attachment_get_file (EAttachment *attachment);
void e_attachment_set_file (EAttachment *attachment,
GFile *file);
GFileInfo * e_attachment_get_file_info (EAttachment *attachment);
+void e_attachment_set_file_info (EAttachment *attachment, GFileInfo *file_info);
+
gboolean e_attachment_get_loading (EAttachment *attachment);
CamelMimePart * e_attachment_get_mime_part (EAttachment *attachment);
void e_attachment_set_mime_part (EAttachment *attachment,