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, \
sizeof(ModestTnyAttachment),
1, /* n_preallocs */
(GInstanceInitFunc) modest_tny_attachment_init,
+ NULL
};
my_type = g_type_register_static (G_TYPE_OBJECT,
"ModestTnyAttachment",
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;
priv->stream = thing;
}
-TnyStreamIface *
+TnyStream *
modest_tny_attachment_get_stream (ModestTnyAttachment *self)
{
ModestTnyAttachmentPrivate *priv;
ModestTnyAttachment *
-modest_tny_attachment_new_from_mime_part(TnyMsgMimePartIface *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_msg_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_msg_mime_part_iface_get_content_type(part));
- modest_tny_attachment_set_name(self,
- tny_msg_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_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 = 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");
- if (!part)
- part = modest_tny_msg_actions_find_body_part ((TnyMsgIface *)msg, "text/html");
- if (part) {
- att = modest_tny_attachment_new_from_mime_part(part);
- /* TODO: i18n */
- modest_tny_attachment_set_name(att, "original message");
- list = g_list_append(list, att);
- }
- }
-#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)) {
- att = modest_tny_attachment_new_from_mime_part(part);
- list = g_list_append(list, att);
- }
- attachments = attachments->next;
- }
- return list;
+ return NULL;
}