X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=util%2Fgmime-extra.c;h=8f9e77a1bb2a930bc3fd5271ff4791f72309bd59;hp=33751de7d20c4b70e6cfbed56f1128db4c9467ac;hb=32819f74d3ac2eee25cf234d988688cc82ecbc0a;hpb=d7fea369160c548524fd8958ff88d6faacfabe3a

diff --git a/util/gmime-extra.c b/util/gmime-extra.c
index 33751de7..8f9e77a1 100644
--- a/util/gmime-extra.c
+++ b/util/gmime-extra.c
@@ -32,6 +32,19 @@ g_string_talloc_strdup (void *ctx, char *g_string)
 
 #if (GMIME_MAJOR_VERSION < 3)
 
+char *
+g_mime_message_get_address_string (GMimeMessage *message, GMimeRecipientType type)
+{
+    InternetAddressList *list = g_mime_message_get_recipients (message, type);
+    return internet_address_list_to_string (list, 0);
+}
+
+inline InternetAddressList *
+g_mime_message_get_addresses (GMimeMessage *message, GMimeRecipientType type)
+{
+    return g_mime_message_get_recipients (message, type);
+}
+
 char *
 g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
 {
@@ -39,6 +52,17 @@ g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
     return g_string_talloc_strdup (ctx, date);
 }
 
+InternetAddressList *
+g_mime_message_get_from (GMimeMessage *message)
+{
+    return internet_address_list_parse_string (g_mime_message_get_sender (message));
+}
+
+const char *
+g_mime_message_get_from_string (GMimeMessage *message) {
+    return  g_mime_message_get_sender (message);
+}
+
 InternetAddressList *
 g_mime_message_get_reply_to_list (GMimeMessage *message)
 {
@@ -63,6 +87,13 @@ g_mime_message_get_reply_to_string (void *ctx, GMimeMessage *message)
 
 #else /* GMime >= 3.0 */
 
+char *
+g_mime_message_get_address_string (GMimeMessage *message, GMimeAddressType type)
+{
+    InternetAddressList *list = g_mime_message_get_addresses (message, type);
+    return internet_address_list_to_string (list, NULL, 0);
+}
+
 char *
 g_mime_message_get_date_string (void *ctx, GMimeMessage *message)
 {
@@ -81,6 +112,12 @@ g_mime_message_get_reply_to_list(GMimeMessage *message)
     return g_mime_message_get_reply_to (message);
 }
 
+const char *
+g_mime_message_get_from_string (GMimeMessage *message)
+{
+    return g_mime_object_get_header (GMIME_OBJECT (message), "From");
+}
+
 char *
 g_mime_message_get_reply_to_string (void *ctx, GMimeMessage *message)
 {