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

cli: replace use of g_mime_message_get_date_as_string

Browse source 
This function goes away in gmime-3.0. Also, the memory management is
apparently error prone, witness the memory leak in notmuch-reply.
This commit is contained in:
David Bremner 2017-05-04 08:48:44 -04:00
parent a58c75fdf6
commit 67dbd24ece
4 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
notmuch-reply.c
View file

@ -61,7 +61,7 @@ format_part_reply (GMimeStream *stream, mime_node_t *node)
recipients_string);
g_free (recipients_string);
g_mime_stream_printf (stream, "> Subject: %s\n", g_mime_message_get_subject (message));
g_mime_stream_printf (stream, "> Date: %s\n", g_mime_message_get_date_as_string (message));
g_mime_stream_printf (stream, "> Date: %s\n", g_mime_message_get_date_string (node, message));
g_mime_stream_printf (stream, ">\n");
} else if (GMIME_IS_PART (node->part)) {
GMimeContentType *content_type = g_mime_object_get_content_type (node->part);

8
notmuch-show.c
View file

@ -204,7 +204,6 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message,
InternetAddressList *recipients;
char *recipients_string;
const char *reply_to_string;
char *date_string;
sp->begin_map (sp);
@ -252,9 +251,7 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message,
sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "References"));
} else {
sp->map_key (sp, "Date");
date_string = g_mime_message_get_date_as_string (message);
sp->string (sp, date_string);
g_free (date_string);
sp->string (sp, g_mime_message_get_date_string (sp, message));
}
sp->end (sp);
@ -532,9 +529,8 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,
if (recipients_string)
g_mime_stream_printf (stream, "Cc: %s\n", recipients_string);
g_free (recipients_string);
date_string = g_mime_message_get_date_as_string (message);
date_string = g_mime_message_get_date_string (node, message);
g_mime_stream_printf (stream, "Date: %s\n", date_string);
g_free (date_string);
g_mime_stream_printf (stream, "\fheader}\n");
g_mime_stream_printf (stream, "\fbody{\n");

35
util/gmime-extra.c
View file

@ -18,3 +18,38 @@ g_mime_stream_stdout_new()
return stream_buffered;
}
/**
* copy a glib string into a talloc context, and free it.
*/
static char*
g_string_talloc_strdup (void *ctx, char *g_string)
{
char *new_str = talloc_strdup (ctx, g_string);
g_free (g_string);
return new_str;
}
#if (GMIME_MAJOR_VERSION < 3)
char *
g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
{
char *date = g_mime_message_get_date_as_string (message);
return g_string_talloc_strdup (ctx, date);
}
#else /* GMime >= 3.0 */
char *
g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
{
GDateTime* parsed_date = g_mime_message_get_date (message);
if (parsed_date) {
char *date = g_mime_utils_header_format_date (parsed_date);
return g_string_talloc_strdup (ctx, date);
} else {
return talloc_strdup(ctx, "Thu, 01 Jan 1970 00:00:00 +0000");
}
}
#endif

8
util/gmime-extra.h
View file

@ -3,4 +3,12 @@
#include <gmime/gmime.h>
GMimeStream *g_mime_stream_stdout_new(void);
#include <talloc.h>
/**
* return talloc allocated date string
*/
char *g_mime_message_get_date_string (void *ctx, GMimeMessage *message);
#endif