X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-attachment.c;h=e35fdee32925f95ec25c053b1a990a95910c3aa3;hp=475912191cee8f8f35122410471bcdcfb717a15a;hb=6a147851f0dfaca238819796a3dceb571fdff809;hpb=763ee34279d09793647809e9e0ef2748b9f8e957

diff --git a/src/modest-tny-attachment.c b/src/modest-tny-attachment.c
index 4759121..e35fdee 100644
--- a/src/modest-tny-attachment.c
+++ b/src/modest-tny-attachment.c
@@ -1,6 +1,34 @@
-/* modest-tny-attachment.c */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 
-/* insert (c)/licensing information) */
+/* modest-tny-attachment.c */
 
 #include "modest-tny-attachment.h"
 #include "modest-tny-msg-actions.h"
@@ -181,24 +209,26 @@ modest_tny_attachment_get_mime_type (ModestTnyAttachment *self)
 }
 
 
-
 void
 modest_tny_attachment_guess_mime_type (ModestTnyAttachment *self)
 {
 	ModestTnyAttachmentPrivate *priv;
-	gchar *suffixes[] = {".jpg", ".gif", ".mp3", NULL};
-	gchar *types[]    = {"image/jpeg", "image/gif", "audio/mpeg", NULL};
+	gchar *suffixes[] = {".jpg", ".gif", ".png", ".mp3", ".ogg", /* default: */ "", NULL};
+	gchar *types[]    = {"image/jpeg", "image/gif", "image/png", "audio/mpeg", "application/ogg", "application/octet-stream", NULL};
+	gchar *low_fn;
 	gint pos;
 	
 	priv = MODEST_TNY_ATTACHMENT_GET_PRIVATE(self);
 	if (!priv->filename)
 		return;
 	
+	low_fn = g_utf8_strdown(priv->filename, -1);
 	for (pos = 0 ; suffixes[pos] ; pos++) {
-		if (g_str_has_suffix(priv->filename, suffixes[pos]))
+		if (g_str_has_suffix(low_fn, suffixes[pos]))
 			break;
 	}
 	
+	g_free(low_fn);
 	g_free(priv->mime_type);
 	if (suffixes[pos])
 		priv->mime_type = g_strdup(types[pos]);
@@ -245,6 +275,7 @@ modest_tny_attachment_get_stream (ModestTnyAttachment *self)
 void
 modest_tny_attachment_free_list(GList *list)
 {
+	/* this is pretty generic for a GList of GObjects */
 	GList *pos;
 	
 	for (pos = list; pos; pos = pos->next)
@@ -273,15 +304,38 @@ modest_tny_attachment_new_from_mime_part(TnyMsgMimePartIface *part)
 	return self;
 }
 
+ModestTnyAttachment *
+modest_tny_attachment_new_from_message(const TnyMsgIface *msg)
+{
+	TnyStreamIface *mem_stream, *msg_stream;
+	ModestTnyAttachment *self;
+	gint res;
+	
+	mem_stream = TNY_STREAM_IFACE(tny_stream_camel_new(camel_stream_mem_new()));
+	msg_stream = tny_msg_mime_part_iface_get_stream(TNY_MSG_MIME_PART_IFACE(msg));
+	printf("ping\n");
+	tny_stream_iface_reset(msg_stream);
+	res = tny_stream_iface_write_to_stream(msg_stream, mem_stream);
+	//tny_msg_mime_part_iface_write_to_stream(TNY_MSG_MIME_PART_IFACE(msg), mem_stream);
+	printf("pong, %d\n", res);
+	tny_stream_iface_reset(msg_stream);
+	tny_stream_iface_reset(mem_stream);
+	self = modest_tny_attachment_new();
+	modest_tny_attachment_set_stream(self, mem_stream);
+	modest_tny_attachment_set_mime_type(self, "message/rfc822");
+	modest_tny_attachment_set_name(self, "original message");
+	return self;
+}
 
 GList *
 modest_tny_attachment_new_list_from_msg(const TnyMsgIface *msg, gboolean with_body)
 {
 	GList *list = NULL;
-	const GList *attachments;
+	const GList *attachments = NULL;
 	TnyMsgMimePartIface *part;
 	ModestTnyAttachment *att;
 	
+#if 0	
 	if (with_body) {
 		/* TODO: make plain over html configurable */
 		part = modest_tny_msg_actions_find_body_part ((TnyMsgIface *)msg, "text/plain");
@@ -294,7 +348,12 @@ modest_tny_attachment_new_list_from_msg(const TnyMsgIface *msg, gboolean with_bo
 			list = g_list_append(list, att);
 		}
 	}
-	attachments = tny_msg_iface_get_parts((TnyMsgIface *)msg);
+#endif
+	if (with_body) {
+		list = g_list_append(list, modest_tny_attachment_new_from_message(msg));
+	} else {
+		attachments = tny_msg_iface_get_parts((TnyMsgIface *)msg);
+	}
 	while (attachments) {
 		part = attachments->data;
 		if (tny_msg_mime_part_iface_is_attachment(part)) {