debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

show: Convert format_headers_json to use sprinter

Browse source 
This no longer requires a talloc context (not that it really did
before since it didn't return anything), so we remove its context
argument.
This commit is contained in:
Austin Clements 2012-08-02 21:14:53 -04:00 committed by David Bremner
parent 3a08341e50
commit 7018fc58b4
3 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
notmuch-client.h
View file

@ -183,7 +183,8 @@ format_part_json (const void *ctx, struct sprinter *sp, mime_node_t *node,
notmuch_bool_t first, notmuch_bool_t output_body); notmuch_bool_t first, notmuch_bool_t output_body);
void void
format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply); format_headers_json (struct sprinter *sp, GMimeMessage *message,
notmuch_bool_t reply);
typedef enum { typedef enum {
NOTMUCH_SHOW_TEXT_PART_REPLY = 1 << 0, NOTMUCH_SHOW_TEXT_PART_REPLY = 1 << 0,

2
notmuch-reply.c
View file

@ -617,7 +617,7 @@ notmuch_reply_format_json(void *ctx,
/* The headers of the reply message we've created */ /* The headers of the reply message we've created */
printf ("{\"reply-headers\": "); printf ("{\"reply-headers\": ");
format_headers_json (ctx, reply, TRUE); format_headers_json (sp, reply, TRUE);
g_object_unref (G_OBJECT (reply)); g_object_unref (G_OBJECT (reply));
reply = NULL; reply = NULL;

68
notmuch-show.c
View file

@ -199,48 +199,46 @@ _is_from_line (const char *line)
} }
void void
format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply) format_headers_json (sprinter_t *sp, GMimeMessage *message,
notmuch_bool_t reply)
{ {
void *local = talloc_new (ctx);
InternetAddressList *recipients; InternetAddressList *recipients;
const char *recipients_string; const char *recipients_string;
printf ("{%s: %s", sp->begin_map (sp);
json_quote_str (local, "Subject"),
json_quote_str (local, g_mime_message_get_subject (message))); sp->map_key (sp, "Subject");
printf (", %s: %s", sp->string (sp, g_mime_message_get_subject (message));
json_quote_str (local, "From"),
json_quote_str (local, g_mime_message_get_sender (message))); sp->map_key (sp, "From");
sp->string (sp, g_mime_message_get_sender (message));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string) {
printf (", %s: %s", sp->map_key (sp, "To");
json_quote_str (local, "To"), sp->string (sp, recipients_string);
json_quote_str (local, recipients_string));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string)
printf (", %s: %s",
json_quote_str (local, "Cc"),
json_quote_str (local, recipients_string));
if (reply) {
printf (", %s: %s",
json_quote_str (local, "In-reply-to"),
json_quote_str (local, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to")));
printf (", %s: %s",
json_quote_str (local, "References"),
json_quote_str (local, g_mime_object_get_header (GMIME_OBJECT (message), "References")));
} else {
printf (", %s: %s",
json_quote_str (local, "Date"),
json_quote_str (local, g_mime_message_get_date_as_string (message)));
} }
printf ("}"); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) {
sp->map_key (sp, "Cc");
sp->string (sp, recipients_string);
}
talloc_free (local); if (reply) {
sp->map_key (sp, "In-reply-to");
sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to"));
sp->map_key (sp, "References");
sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "References"));
} else {
sp->map_key (sp, "Date");
sp->string (sp, g_mime_message_get_date_as_string (message));
}
sp->end (sp);
} }
/* Write a MIME text part out to the given stream. /* Write a MIME text part out to the given stream.
@ -575,7 +573,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,
format_message_json (ctx, node->envelope_file); format_message_json (ctx, node->envelope_file);
printf ("\"headers\": "); printf ("\"headers\": ");
format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE); format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);
if (output_body) { if (output_body) {
printf (", \"body\": ["); printf (", \"body\": [");
@ -651,7 +649,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,
} else if (GMIME_IS_MESSAGE (node->part)) { } else if (GMIME_IS_MESSAGE (node->part)) {
printf (", \"content\": [{"); printf (", \"content\": [{");
printf ("\"headers\": "); printf ("\"headers\": ");
format_headers_json (local, GMIME_MESSAGE (node->part), FALSE); format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);
printf (", \"body\": ["); printf (", \"body\": [");
terminator = "]}]"; terminator = "]}]";