aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-attachment-dialog.c
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc/e-attachment-dialog.c')
-rw-r--r--widgets/misc/e-attachment-dialog.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c
index da3c3a855c..a844c228eb 100644
--- a/widgets/misc/e-attachment-dialog.c
+++ b/widgets/misc/e-attachment-dialog.c
@@ -58,20 +58,24 @@ attachment_dialog_update (EAttachmentDialog *dialog)
attachment = e_attachment_dialog_get_attachment (dialog);
- if (E_IS_ATTACHMENT (attachment)) {
+ if (attachment != NULL) {
file_info = e_attachment_get_file_info (attachment);
- content_type = e_attachment_get_content_type (attachment);
- display_name = e_attachment_get_display_name (attachment);
description = e_attachment_get_description (attachment);
disposition = e_attachment_get_disposition (attachment);
} else {
file_info = NULL;
- content_type = NULL;
- display_name = NULL;
description = NULL;
disposition = NULL;
}
+ if (file_info != NULL) {
+ content_type = g_file_info_get_content_type (file_info);
+ display_name = g_file_info_get_display_name (file_info);
+ } else {
+ content_type = NULL;
+ display_name = NULL;
+ }
+
if (content_type != NULL) {
gchar *comment;
gchar *mime_type;