mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 02:48:08 +01:00
lib: paper over allocation difference
In gmime 3.0 this function is "transfer none", so no deallocation is needed (or permitted)
This commit is contained in:
parent
eeb64cdeeb
commit
4ce7591610
3 changed files with 5 additions and 2 deletions
|
@ -501,7 +501,7 @@ _notmuch_message_index_file (notmuch_message_t *message,
|
||||||
addresses = g_mime_message_get_from (mime_message);
|
addresses = g_mime_message_get_from (mime_message);
|
||||||
if (addresses) {
|
if (addresses) {
|
||||||
_index_address_list (message, "from", addresses);
|
_index_address_list (message, "from", addresses);
|
||||||
g_object_unref (addresses);
|
g_mime_2_6_unref (addresses);
|
||||||
}
|
}
|
||||||
|
|
||||||
addresses = g_mime_message_get_all_recipients (mime_message);
|
addresses = g_mime_message_get_all_recipients (mime_message);
|
||||||
|
|
|
@ -286,7 +286,7 @@ static InternetAddressList *get_sender(GMimeMessage *message)
|
||||||
if (! reply_to_header_is_redundant (message, reply_to_list))
|
if (! reply_to_header_is_redundant (message, reply_to_list))
|
||||||
return reply_to_list;
|
return reply_to_list;
|
||||||
|
|
||||||
g_object_unref (G_OBJECT (reply_to_list));
|
g_mime_2_6_unref (G_OBJECT (reply_to_list));
|
||||||
}
|
}
|
||||||
|
|
||||||
return g_mime_message_get_from (message);
|
return g_mime_message_get_from (message);
|
||||||
|
|
|
@ -13,6 +13,8 @@ GMimeStream *g_mime_stream_stdout_new(void);
|
||||||
#define GMIME_ADDRESS_TYPE_CC GMIME_RECIPIENT_TYPE_CC
|
#define GMIME_ADDRESS_TYPE_CC GMIME_RECIPIENT_TYPE_CC
|
||||||
#define GMIME_ADDRESS_TYPE_BCC GMIME_RECIPIENT_TYPE_BCC
|
#define GMIME_ADDRESS_TYPE_BCC GMIME_RECIPIENT_TYPE_BCC
|
||||||
|
|
||||||
|
#define g_mime_2_6_unref(obj) g_object_unref (obj)
|
||||||
|
|
||||||
#else /* GMime >= 3.0 */
|
#else /* GMime >= 3.0 */
|
||||||
typedef GMimeAddressType GMimeRecipientType;
|
typedef GMimeAddressType GMimeRecipientType;
|
||||||
|
|
||||||
|
@ -51,6 +53,7 @@ typedef GMimeTrust GMimeCertificateTrust;
|
||||||
#define GMIME_CERTIFICATE_TRUST_FULLY GMIME_TRUST_FULL
|
#define GMIME_CERTIFICATE_TRUST_FULLY GMIME_TRUST_FULL
|
||||||
#define GMIME_CERTIFICATE_TRUST_ULTIMATE GMIME_TRUST_ULTIMATE
|
#define GMIME_CERTIFICATE_TRUST_ULTIMATE GMIME_TRUST_ULTIMATE
|
||||||
|
|
||||||
|
#define g_mime_2_6_unref(obj) /*ignore*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue