[evolution] Add e_mail_part_attachment_ref_attachment().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Add e_mail_part_attachment_ref_attachment().
- Date: Sun, 19 May 2013 17:07:36 +0000 (UTC)
commit 62daae00eb589b4ac430c2215b9b21627787825d
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun May 19 09:54:53 2013 -0400
Add e_mail_part_attachment_ref_attachment().
em-format/e-mail-formatter-attachment.c | 12 ++++++------
em-format/e-mail-formatter-print.c | 2 +-
em-format/e-mail-part-attachment.c | 9 +++++++++
em-format/e-mail-part-attachment.h | 2 ++
4 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index b7df8aa..7718090 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -138,8 +138,8 @@ emfe_attachment_format (EMailFormatterExtension *extension,
EAttachment *attachment;
GList *head, *link;
- attachment = g_object_ref (
- E_MAIL_PART_ATTACHMENT (part)->attachment);
+ attachment = e_mail_part_attachment_ref_attachment (
+ E_MAIL_PART_ATTACHMENT (part));
head = g_queue_peek_head_link (&part->validities);
@@ -201,8 +201,8 @@ emfe_attachment_format (EMailFormatterExtension *extension,
const gchar *description;
const gchar *display_name;
- attachment = g_object_ref (
- E_MAIL_PART_ATTACHMENT (part)->attachment);
+ attachment = e_mail_part_attachment_ref_attachment (
+ E_MAIL_PART_ATTACHMENT (part));
fi = e_attachment_get_file_info (attachment);
display_name = g_file_info_get_display_name (fi);
@@ -374,8 +374,8 @@ emfe_attachment_get_widget (EMailFormatterExtension *extension,
g_return_val_if_fail (E_IS_MAIL_PART_ATTACHMENT (part), NULL);
- attachment = g_object_ref (
- E_MAIL_PART_ATTACHMENT (part)->attachment);
+ attachment = e_mail_part_attachment_ref_attachment (
+ E_MAIL_PART_ATTACHMENT (part));
part_id = e_mail_part_get_id (part);
diff --git a/em-format/e-mail-formatter-print.c b/em-format/e-mail-formatter-print.c
index 70689df..a855ebc 100644
--- a/em-format/e-mail-formatter-print.c
+++ b/em-format/e-mail-formatter-print.c
@@ -62,7 +62,7 @@ mail_formatter_print_write_attachments (EMailFormatter *formatter,
const gchar *display_name;
part = g_queue_pop_head (attachments);
- attachment = g_object_ref (part->attachment);
+ attachment = e_mail_part_attachment_ref_attachment (part);
file_info = e_attachment_get_file_info (attachment);
if (file_info == NULL) {
diff --git a/em-format/e-mail-part-attachment.c b/em-format/e-mail-part-attachment.c
index 2047f9d..ef19a81 100644
--- a/em-format/e-mail-part-attachment.c
+++ b/em-format/e-mail-part-attachment.c
@@ -28,3 +28,12 @@ e_mail_part_attachment_free (EMailPartAttachment *empa)
empa->attachment_view_part_id = NULL;
}
}
+
+EAttachment *
+e_mail_part_attachment_ref_attachment (EMailPartAttachment *part)
+{
+ g_return_val_if_fail (part != NULL, NULL);
+
+ return g_object_ref (part->attachment);
+}
+
diff --git a/em-format/e-mail-part-attachment.h b/em-format/e-mail-part-attachment.h
index d44c599..24f0cf2 100644
--- a/em-format/e-mail-part-attachment.h
+++ b/em-format/e-mail-part-attachment.h
@@ -43,6 +43,8 @@ typedef struct _EMailPartAttachment {
} EMailPartAttachment;
void e_mail_part_attachment_free (EMailPartAttachment *empa);
+EAttachment * e_mail_part_attachment_ref_attachment
+ (EMailPartAttachment *part);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]