diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-05-17 01:10:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-05-20 01:07:20 +0800 |
| commit | c025ffbb296501d2da8cba78aa6a14008055cf87 (patch) | |
| tree | 1ef1bb4d02d699fc67e731e54bb1017852be4d83 /em-format/e-mail-formatter-quote-message-rfc822.c | |
| parent | cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9 (diff) | |
| download | gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.gz gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.bz2 gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.lz gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.xz gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.tar.zst gsoc2013-evolution-c025ffbb296501d2da8cba78aa6a14008055cf87.zip | |
Add e_mail_part_get_id().
Diffstat (limited to 'em-format/e-mail-formatter-quote-message-rfc822.c')
| -rw-r--r-- | em-format/e-mail-formatter-quote-message-rfc822.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c index 710ee9f18c..ae09a0285b 100644 --- a/em-format/e-mail-formatter-quote-message-rfc822.c +++ b/em-format/e-mail-formatter-quote-message-rfc822.c @@ -59,6 +59,9 @@ emfqe_message_rfc822_format (EMailFormatterExtension *extension, GList *head, *link; gchar *header, *end; EMailFormatterQuoteContext *qc = (EMailFormatterQuoteContext *) context; + const gchar *part_id; + + part_id = e_mail_part_get_id (part); if (g_cancellable_is_cancelled (cancellable)) return FALSE; @@ -67,7 +70,7 @@ emfqe_message_rfc822_format (EMailFormatterExtension *extension, camel_stream_write_string (stream, header, cancellable, NULL); g_free (header); - e_mail_part_list_queue_parts (context->part_list, part->id, &queue); + e_mail_part_list_queue_parts (context->part_list, part_id, &queue); if (g_queue_is_empty (&queue)) return FALSE; @@ -77,10 +80,13 @@ emfqe_message_rfc822_format (EMailFormatterExtension *extension, head = g_queue_peek_head (&queue); - end = g_strconcat (part->id, ".end", NULL); + end = g_strconcat (part_id, ".end", NULL); for (link = head; link != NULL; link = g_list_next (link)) { EMailPart *p = link->data; + const gchar *p_id; + + p_id = e_mail_part_get_id (p); /* Skip attachment bar */ if (g_str_has_suffix (p->id, ".attachment-bar")) @@ -99,12 +105,12 @@ emfqe_message_rfc822_format (EMailFormatterExtension *extension, /* Check for nested rfc822 messages */ if (g_str_has_suffix (p->id, ".rfc822")) { - gchar *sub_end = g_strconcat (p->id, ".end", NULL); + gchar *sub_end = g_strconcat (p_id, ".end", NULL); while (link != NULL) { p = link->data; - if (g_strcmp0 (p->id, sub_end) == 0) + if (g_strcmp0 (p_id, sub_end) == 0) break; link = g_list_next (link); @@ -113,7 +119,7 @@ emfqe_message_rfc822_format (EMailFormatterExtension *extension, continue; } - if ((g_strcmp0 (p->id, end) == 0)) + if ((g_strcmp0 (p_id, end) == 0)) break; if (p->is_hidden) |