From d56c675a5d1e7a12e322e48abb5bec035dddb176 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Mon, 14 Nov 2011 17:25:21 +0100
Subject: [PATCH] In SolipaMail implemented attachments (closes #93).

---
 src/mail.c            | 121 ++++++++++++++++++++++++++++++++++++------
 tests/gnome-globe.png | Bin 0 -> 4780 bytes
 tests/mail.c          |   4 ++
 3 files changed, 110 insertions(+), 15 deletions(-)
 create mode 100644 tests/gnome-globe.png

diff --git a/src/mail.c b/src/mail.c
index 095cbb3..4a969bb 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -242,6 +242,8 @@ static CamelMimeMessage
 	SolipaMailPrivate *priv;
 
 	CamelMimeMessage *msg;
+	CamelMultipart *mp;
+	CamelMimePart *part;
 
 	g_return_val_if_fail (IS_SOLIPA_MAIL (mail), NULL);
 
@@ -265,6 +267,8 @@ static CamelMimeMessage
 			return NULL;
 		}
 
+	mp = NULL;
+
 	msg = camel_mime_message_new ();
 	camel_mime_message_set_subject (msg, priv->subject);
 
@@ -286,18 +290,28 @@ static CamelMimeMessage
 			camel_mime_message_set_recipients (msg, CAMEL_RECIPIENT_TYPE_BCC, priv->recipients_bcc);
 		}
 
-	/* TODO multipart message */
-	if (priv->body_plain != NULL
-	    && priv->body_html != NULL)
+	if (priv->attachments != NULL
+	    || (priv->body_plain != NULL
+	        && priv->body_html != NULL))
 		{
-			CamelMultipart *mp;
-			CamelMimePart *part;
-
 			mp = camel_multipart_new ();
-			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/alternative");
+			if (priv->attachments == NULL)
+				{
+					camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/alternative");
+				}
+			else
+				{
+					camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed");
+				}
+
 			camel_multipart_set_boundary (mp, NULL);
 			camel_multipart_set_preface (mp, "This is a multipart message in MIME format.");
+		}
 
+	/* multipart/alternative message */
+	if (priv->body_plain != NULL
+	    && priv->body_html != NULL)
+		{
 			part = camel_mime_part_new ();
 			camel_mime_part_set_content (part, priv->body_plain, strlen (priv->body_plain), "text/plain");
 			camel_multipart_add_part (mp, part);
@@ -307,24 +321,103 @@ static CamelMimeMessage
 			camel_mime_part_set_content (part, priv->body_html, strlen (priv->body_html), "text/html");
 			camel_multipart_add_part (mp, part);
 			g_object_unref (part);
-
-			camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp));
 		}
 	else
 		{
+			if (mp != NULL)
+				{
+					part = camel_mime_part_new ();
+				}
+			else
+				{
+					part = CAMEL_MIME_PART (msg);
+				}
+
 			if (priv->body_plain != NULL)
 				{
-					camel_mime_part_set_content (CAMEL_MIME_PART (msg), priv->body_plain, strlen (priv->body_plain), "text/plain");
+					camel_mime_part_set_content (CAMEL_MIME_PART (part), priv->body_plain, strlen (priv->body_plain), "text/plain");
+				}
+			else if (priv->body_html != NULL)
+				{
+					camel_mime_part_set_content (CAMEL_MIME_PART (part), priv->body_html, strlen (priv->body_html), "text/html");
 				}
-			if (priv->body_html != NULL)
+
+			if (mp != NULL)
 				{
-					camel_mime_part_set_content (CAMEL_MIME_PART (msg), priv->body_html, strlen (priv->body_html), "text/html");
+					camel_multipart_add_part (mp, part);
+					g_object_unref (part);
 				}
 		}
 
+	/* multipart message with attachment(s) */
 	if (priv->attachments != NULL)
 		{
-			/* multipart message */
+			GSList *attachs;
+			GFile *file;
+			CamelDataWrapper *dw;
+			GError *error;
+			GFileInfo *file_info;
+			CamelStream *cstream;
+
+			attachs = priv->attachments;
+			while (attachs != NULL)
+				{
+					file = g_file_new_for_path ((gchar *)attachs->data);
+					if (!g_file_query_exists (file, NULL))
+						{
+							g_warning ("File doesn't exists: %s", (gchar *)attachs->data);
+						}
+					else
+						{
+							error = NULL;
+							file_info = g_file_query_info (file,
+							                               "standard::*",
+							                               0,
+							                               NULL,
+							                               &error);
+
+							if (file_info == NULL || error != NULL)
+								{
+									g_warning ("Unable to get mime type of file %s: %s.",
+									           error != NULL && error->message != NULL ? error->message : "no details");
+								}
+							else
+								{
+									dw = camel_data_wrapper_new ();
+
+									camel_data_wrapper_set_mime_type (dw, g_content_type_get_mime_type (g_file_info_get_content_type (file_info)));
+
+									error = NULL;
+									cstream = camel_stream_fs_new_with_name ((gchar *)attachs->data, O_RDONLY, 0, &error);
+									error = NULL;
+#ifdef CAMEL3
+									camel_data_wrapper_construct_from_stream_sync (dw, cstream, NULL, &error);
+#else
+									camel_data_wrapper_construct_from_stream (dw, cstream, &error);
+#endif
+									g_object_unref (cstream);
+
+									part = camel_mime_part_new ();
+									camel_medium_set_content (CAMEL_MEDIUM (part), dw);
+									g_object_unref (dw);
+
+									camel_mime_part_set_filename (CAMEL_MIME_PART (part), g_file_get_basename (file));
+									camel_mime_part_set_disposition (CAMEL_MIME_PART (part), "attachment");
+
+									camel_multipart_add_part (mp, part);
+									g_object_unref (part);
+									}
+						}
+					g_object_unref (file);
+
+					attachs = g_slist_next (attachs);
+				}
+		}
+
+	if (mp != NULL)
+		{
+			camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp));
+			g_object_unref (mp);
 		}
 
 	return msg;
@@ -595,7 +688,6 @@ solipa_mail_set_property (GObject *object,
                    GParamSpec *pspec)
 {
 	SolipaMail *solipa_mail = (SolipaMail *)object;
-
 	SolipaMailPrivate *priv = SOLIPA_MAIL_GET_PRIVATE (solipa_mail);
 
 	switch (property_id)
@@ -613,7 +705,6 @@ solipa_mail_get_property (GObject *object,
                    GParamSpec *pspec)
 {
 	SolipaMail *solipa_mail = (SolipaMail *)object;
-
 	SolipaMailPrivate *priv = SOLIPA_MAIL_GET_PRIVATE (solipa_mail);
 
 	switch (property_id)
diff --git a/tests/gnome-globe.png b/tests/gnome-globe.png
new file mode 100644
index 0000000000000000000000000000000000000000..c85ca9f475f2973ab7ae6809f27fd19ded285432
GIT binary patch
literal 4780
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
GLSTZMUs${V

literal 0
HcmV?d00001

diff --git a/tests/mail.c b/tests/mail.c
index 045ea37..2032f6a 100644
--- a/tests/mail.c
+++ b/tests/mail.c
@@ -54,6 +54,10 @@ main (int argc, char **argv)
 	                      "</body>\n"
 	                      "</html>");
 
+	solipa_mail_add_attachment (smail, "mail.c");
+	solipa_mail_add_attachment (smail, "gnome-globe.png");
+	solipa_mail_add_attachment (smail, "ooo.odt");
+
 	strmail = solipa_mail_get_as_string (smail);
 	g_message ("The email text:\n%s", strmail);
 
-- 
2.49.0