X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-attachment.c;h=9fbf0ccc18c0315a8a14afc4c5cbe750cdbf4df5;hb=b514a9816530ec797b0f9b8b026d557695d4870d;hp=20ef3a29b63114393738506983f1e00c904b4386;hpb=4cb37a953e7198501a0aee3b8205b728129d78bc;p=modest

diff --git a/src/modest-tny-attachment.c b/src/modest-tny-attachment.c
index 20ef3a2..9fbf0cc 100644
--- a/src/modest-tny-attachment.c
+++ b/src/modest-tny-attachment.c
@@ -59,7 +59,7 @@ struct _ModestTnyAttachmentPrivate {
 	gchar *mime_type;
 	gchar *disposition;
 	gchar *content_id;
-	TnyStreamIface *stream;
+	TnyStream *stream;
 };
 #define MODEST_TNY_ATTACHMENT_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                    MODEST_TYPE_TNY_ATTACHMENT, \
@@ -237,20 +237,14 @@ modest_tny_attachment_guess_mime_type (ModestTnyAttachment *self)
 		priv->mime_type = NULL;
 }
 
-static TnyStreamIface *
+static TnyStream *
 make_stream_from_file(const gchar * filename)
 {
-	gint file;
-	
-	file = open(filename, O_RDONLY);
-	if (file < 0)
-		return NULL;
-
-	return TNY_STREAM_IFACE(tny_stream_camel_new(camel_stream_fs_new_with_fd(file)));
+	return NULL;
 }
 
 void
-modest_tny_attachment_set_stream(ModestTnyAttachment *self, TnyStreamIface *thing)
+modest_tny_attachment_set_stream(ModestTnyAttachment *self, TnyStream *thing)
 {
 	ModestTnyAttachmentPrivate *priv;
 	
@@ -260,7 +254,7 @@ modest_tny_attachment_set_stream(ModestTnyAttachment *self, TnyStreamIface *thin
 	priv->stream = thing;
 }
 
-TnyStreamIface *
+TnyStream *
 modest_tny_attachment_get_stream (ModestTnyAttachment *self)
 {
 	ModestTnyAttachmentPrivate *priv;
@@ -288,42 +282,13 @@ modest_tny_attachment_free_list(GList *list)
 
 
 ModestTnyAttachment *
-modest_tny_attachment_new_from_mime_part(TnyMimePartIface *part)
+modest_tny_attachment_new_from_mime_part(TnyMimePart *part)
 {
-	TnyStreamIface *mem_stream;
-	ModestTnyAttachment *self;
-	
-	mem_stream = TNY_STREAM_IFACE(tny_stream_camel_new(camel_stream_mem_new()));
-	self = modest_tny_attachment_new();
-	tny_mime_part_iface_decode_to_stream(part, mem_stream);
-	tny_stream_iface_reset(mem_stream);
-	modest_tny_attachment_set_stream(self, mem_stream);
-	modest_tny_attachment_set_mime_type(self,
-	                                    tny_mime_part_iface_get_content_type(part));
-	modest_tny_attachment_set_name(self,
-	                                    tny_mime_part_iface_get_filename(part));
-	return self;
+	return NULL;
 }
 
 ModestTnyAttachment *
-modest_tny_attachment_new_from_message(const TnyMsgIface *msg)
+modest_tny_attachment_new_from_message(const TnyMsg *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_mime_part_iface_get_stream(TNY_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;
+	return NULL;
 }