From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 30 Mar 2015 11:14:41 +0000 (+0100)
Subject: Add workaround to be compatible with gmime 2.2.
X-Git-Tag: 0.9.0~392
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=826050f3a80eb9b2490fa1f472f37002a7620afa;p=thirdparty%2Frspamd.git

Add workaround to be compatible with gmime 2.2.
---

diff --git a/src/libserver/task.c b/src/libserver/task.c
index e7a2c18afa..be6bd134c0 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