diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-30 12:14:41 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-30 12:14:41 +0100 |
| commit | 826050f3a80eb9b2490fa1f472f37002a7620afa (patch) | |
| tree | 175165ada559d6462febc922646735d4381ab68d /src/libserver | |
| parent | 6ebf1e5b3058161fe52c142448bfa497d1628e51 (diff) | |
| download | rspamd-826050f3a80eb9b2490fa1f472f37002a7620afa.tar.gz rspamd-826050f3a80eb9b2490fa1f472f37002a7620afa.zip | |
Add workaround to be compatible with gmime 2.2.
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/task.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/libserver/task.c b/src/libserver/task.c index e7a2c18af..be6bd134c 100644 --- a/src/libserver/task.c +++ b/src/libserver/task.c @@ -371,9 +371,9 @@ rspamd_task_process (struct rspamd_task *task, const gchar * rspamd_task_get_sender (struct rspamd_task *task) { - InternetAddressMailbox *imb; InternetAddress *iaelt = NULL; - +#ifdef GMIME24 + InternetAddressMailbox *imb; if (task->from_envelope != NULL) { iaelt = internet_address_list_get_address (task->from_envelope, 0); @@ -385,6 +385,16 @@ rspamd_task_get_sender (struct rspamd_task *task) INTERNET_ADDRESS_MAILBOX (iaelt) : NULL; return (imb ? internet_address_mailbox_get_addr (imb) : NULL); +#else + if (task->from_envelope != NULL) { + iaelt = internet_address_list_get_address (task->from_envelope); + } + else if (task->from_mime != NULL) { + iaelt = internet_address_list_get_address (task->from_mime); + } + + return (iaelt != NULL ? internet_address_get_addr (iaelt) : NULL); +#endif } gboolean |