in.in => in

[modest] / src / modest-tny-transport-actions.c

diff --git a/src/modest-tny-transport-actions.c b/src/modest-tny-transport-actions.c
index a998161..d12f2d7 100644 (file)
--- a/src/modest-tny-transport-actions.c
+++ b/src/modest-tny-transport-actions.c
@@ -1,6 +1,34 @@
-/* modest-tny-transport-actions.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-transport-actions.c */
 
 #include <tny-msg.h>
 #include <tny-msg-iface.h>                     
@@ -20,9 +48,8 @@
 #include <camel/camel.h>
 #include <camel/camel-folder-summary.h>
 
-
-
 #include "modest-tny-transport-actions.h"
+#include "modest-tny-attachment.h"
 /* include other impl specific header files */
 
 /* 'private'/'protected' functions */
@@ -111,10 +138,11 @@ modest_tny_transport_actions_finalize (GObject *obj)
 /*     free/unref instance resources here */
 }
 
-GObject*
+ModestTnyTransportActions *
 modest_tny_transport_actions_new (void)
 {
-       return G_OBJECT(g_object_new(MODEST_TYPE_TNY_TRANSPORT_ACTIONS, NULL));
+       return MODEST_TNY_TRANSPORT_ACTIONS(g_object_new(MODEST_TYPE_TNY_TRANSPORT_ACTIONS,
+                                                        NULL));
 }
 
 static gboolean
@@ -161,11 +189,12 @@ modest_tny_transport_actions_send_message (ModestTnyTransportActions *self,
        TnyMsgMimePartIface *attachment_part, *text_body_part;
        TnyMsgHeaderIface *headers;
        TnyStreamIface *text_body_stream, *attachment_stream;
-       GList *attachment;
-       gchar *content_type, *attachment_content_type;
-       gchar *filename, *attachment_filename;
-       int file;
-
+       ModestTnyAttachment *attachment;
+       GList *pos;
+       gchar *content_type;
+       const gchar *attachment_content_type;
+       const gchar *attachment_filename;
+       
        new_msg          = TNY_MSG_IFACE(tny_msg_new ());
        headers          = TNY_MSG_HEADER_IFACE(tny_msg_header_new ());
        text_body_stream = TNY_STREAM_IFACE (tny_stream_camel_new
@@ -199,19 +228,17 @@ modest_tny_transport_actions_send_message (ModestTnyTransportActions *self,
                //g_object_unref (G_OBJECT(text_body_part));
        }
        
-       for (    attachment = (GList *)attachments_list;
-                    attachment;
-                attachment = attachment->next    ) {
-               filename = attachment->data;
-               attachment_filename = g_path_get_basename(filename);
-               file = open(filename, O_RDONLY);
-               attachment_stream = TNY_STREAM_IFACE(tny_stream_camel_new(
-                                                   camel_stream_fs_new_with_fd(file)));
-
+       for (    pos = (GList *)attachments_list;
+                pos;
+                pos = pos->next    ) {
+               attachment = pos->data;
+               attachment_filename = modest_tny_attachment_get_name(attachment);
+               attachment_stream = modest_tny_attachment_get_stream(attachment);
                attachment_part = TNY_MSG_MIME_PART_IFACE (tny_msg_mime_part_new (
                                                                camel_mime_part_new()));
                
-               attachment_content_type = "image/jpeg"; /* later... */
+               attachment_content_type = modest_tny_attachment_get_mime_type(attachment);
+                                
                tny_msg_mime_part_iface_construct_from_stream (attachment_part,
                                                               attachment_stream,
                                                               attachment_content_type);
@@ -220,9 +247,7 @@ modest_tny_transport_actions_send_message (ModestTnyTransportActions *self,
                tny_msg_mime_part_iface_set_filename(attachment_part, attachment_filename);
                
                tny_msg_iface_add_part (new_msg, attachment_part);
-               g_object_unref(G_OBJECT(attachment_stream));
                //g_object_unref(G_OBJECT(attachment_part));
-               g_free(attachment_filename);
                //close(file);
        }