From 3450f1bf9844bdf50e62cdfdb8516b193c95601e Mon Sep 17 00:00:00 2001
From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Thu, 5 Jan 2012 15:36:22 +0100
Subject: [PATCH] Aggiunta la funzione SolipaMail::set_notification (closes
 #233).

---
 src/mail.c   | 51 ++++++++++++++++++++++++++++++++++++++++-----------
 src/mail.h   |  4 +++-
 tests/mail.c |  4 +++-
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/mail.c b/src/mail.c
index 0517758..913714c 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -55,6 +55,8 @@ struct _SolipaMailPrivate
 		CamelInternetAddress *recipients_cc;
 		CamelInternetAddress *recipients_bcc;
 
+		gboolean with_notification;
+
 		gchar *body_plain;
 		gchar *body_html;
 
@@ -498,6 +500,16 @@ solipa_mail_get_as_string (SolipaMail *mail)
 	return ret;
 }
 
+void
+solipa_mail_set_notification (SolipaMail *mail, gboolean with_notification)
+{
+	SolipaMailPrivate *priv;
+
+	priv = SOLIPA_MAIL_GET_PRIVATE (mail);
+
+	priv->with_notification = with_notification;
+}
+
 void
 solipa_mail_send (SolipaMail *mail, const gchar *url)
 {
@@ -508,7 +520,9 @@ solipa_mail_send (SolipaMail *mail, const gchar *url)
 
 	CamelMimeMessage *msg;
 
-	CamelInternetAddress *from, *addr, *to;
+	CamelInternetAddress *from;
+	CamelInternetAddress *addr;
+	CamelInternetAddress *to;
 	CamelService *trans;
 
 	CamelSession *session;
@@ -528,12 +542,26 @@ solipa_mail_send (SolipaMail *mail, const gchar *url)
 			return;
 		}
 
-	if (camel_mime_message_get_from (msg) == NULL)
+	from = camel_mime_message_get_from (msg);
+	if (from == NULL)
 		{
 			g_warning ("Cannot send message: no from address set.");
 			return;
 		}
 
+	if (priv->with_notification)
+		{
+			gchar *namep;
+			gchar *addressp;
+
+			if (camel_internet_address_get (from, 0, &namep, &addressp))
+				{
+					camel_medium_add_header (CAMEL_MEDIUM (msg),
+					                         "Disposition-Notification-To",
+					                         addressp);
+				}
+		}
+
 #ifdef G_OS_WIN32
 	/* devo richiamare manualmente l'inizializzazione dei socket in windows
 	 * perché libcamel non lo fa */
@@ -597,14 +625,15 @@ solipa_mail_send (SolipaMail *mail, const gchar *url)
 		}
 
 	to = camel_internet_address_new ();
-	for (i = 0; i < sizeof (types) / sizeof (types[0]); i++) {
-		addr = (CamelInternetAddress *)camel_mime_message_get_recipients (msg, types[i]);
-
-		if (addr)
-			{
-				camel_address_cat (CAMEL_ADDRESS (to), CAMEL_ADDRESS (addr));
-			}
-	}
+	for (i = 0; i < sizeof (types) / sizeof (types[0]); i++)
+		{
+			addr = (CamelInternetAddress *)camel_mime_message_get_recipients (msg, types[i]);
+
+			if (addr)
+				{
+					camel_address_cat (CAMEL_ADDRESS (to), CAMEL_ADDRESS (addr));
+				}
+		}
 
 #ifdef CAMEL3
 	ret = camel_transport_send_to_sync (CAMEL_TRANSPORT (trans),
diff --git a/src/mail.h b/src/mail.h
index 7942ca3..2112fd3 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -74,6 +74,8 @@ void solipa_mail_add_attachment (SolipaMail *mail, const gchar *filename);
 
 gchar *solipa_mail_get_as_string (SolipaMail *mail);
 
+void solipa_mail_set_notification (SolipaMail *mail, gboolean with_notification);
+
 void solipa_mail_send (SolipaMail *mail, const gchar *url);
 
 gboolean solipa_mail_check_email_address (const gchar *address);
diff --git a/tests/mail.c b/tests/mail.c
index 2032f6a..e27aac5 100644
--- a/tests/mail.c
+++ b/tests/mail.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,6 +44,8 @@ main (int argc, char **argv)
 	solipa_mail_add_recipient (smail, addr, SOLIPA_MAIL_RECIPIENT_TYPE_TO);
 	g_object_unref (addr);
 
+	solipa_mail_set_notification (smail, TRUE);
+
 	solipa_mail_set_body (smail, "This is the text\nof the email\n that i'm trying to send to myself.\n\nBye bye\n\nSee you later.",
 	                      "<html>\n"
 	                      "<head>\n"
-- 
2.49.0