Changeset 1194

Timestamp:

11/21/06 11:59:29

Author:

pvanhoof

Message:

Support for rfc822 messages

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-mime-part.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-msg.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-msg.h (modified) (1 diff)
• trunk/libtinymail-test/tny-msg-test.c (modified) (2 diffs)
• trunk/libtinymail/tny-mime-part.c (modified) (3 diffs)
• trunk/libtinymail/tny-mime-part.h (modified) (2 diffs)
• trunk/libtinymail/tny-msg.c (modified) (2 diffs)
• trunk/libtinymail/tny-msg.h (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (14 diffs)
• trunk/libtinymailui/tny-msg-view.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2006-11-21  Philip van Hoof <pvanhoof@gnome.org>
+
+        * Major changes in TnyMsg and TnyMimePart
+        * First support for message/rfc822 messages
+
+        * This was a major API change in all libraries
+
-2006-11-20  Philip van Hoof <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/tny-camel-mime-part.c

@@ -30 +30 @@
-#include <camel/camel-data-wrapper.h>
-#include <tny-camel-shared.h>
+#include <tny-list.h>
-
-static GObjectClass *parent_class = NULL;
@@ -53 +54 @@
-
-/* Locking warning: tny-camel-msg.c also locks priv->part_lock */
+
+
+
+typedef gboolean (*CamelPartFunc)(CamelMimeMessage *, CamelMimePart *, void *data);
+
+static gboolean
+message_foreach_part_rec (CamelMimeMessage *msg, CamelMimePart *part, CamelPartFunc callback, void *data, gboolean firstpart)
+{
+        CamelDataWrapper *containee;
+        int parts, i;
+        int go = TRUE;
+
+        if (!firstpart && callback (msg, part, data) == FALSE)
+                        return FALSE; 
+
+        containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
+
+        if (G_UNLIKELY (containee == NULL))
+                return go;
+
+        if (G_LIKELY (CAMEL_IS_MULTIPART (containee)))
+        {
+                parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
+                for (i = 0; go && i < parts; i++) 
+                {
+                        CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
+                        if (part)
+                                go = message_foreach_part_rec (msg, part, callback, data, FALSE);
+                        else go = FALSE;
+                }
+                
+        } else if (G_LIKELY (CAMEL_IS_MIME_MESSAGE (containee)))
+                go = message_foreach_part_rec (msg, (CamelMimePart *)containee, callback, data, FALSE);
+
+        return go;
+}
+
+static gboolean
+received_a_part (CamelMimeMessage *message, CamelMimePart *part, void *data)
+{
+        TnyList *list = data;
+        TnyMimePart *tpart;
+
+        if (!part)
+                return FALSE;
+
+        tpart = tny_camel_mime_part_new (part);
+
+        tny_list_prepend (list, (GObject*)tpart);
+        g_object_unref (G_OBJECT (tpart));
+
+        return TRUE;
+}
+
+static void
+tny_camel_mime_part_get_parts (TnyMimePart *self, TnyList *list)
+{
+        TNY_CAMEL_MIME_PART_GET_CLASS (self)->get_parts_func (self, list);
+        return;
+}
+
+static void
+tny_camel_mime_part_get_parts_default (TnyMimePart *self, TnyList *list)
+{
+        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
+        gboolean go = TRUE;
+
+        g_assert (TNY_IS_LIST (list));
+
+        g_mutex_lock (priv->part_lock);
+
+        message_foreach_part_rec ((CamelMimeMessage*)priv->part, 
+                (CamelMimePart *)priv->part, received_a_part, list, TRUE); 
+
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+
+
+static gint
+tny_camel_mime_part_add_part (TnyMimePart *self, TnyMimePart *part)
+{
+        return TNY_CAMEL_MIME_PART_GET_CLASS (self)->add_part_func (self, part);
+}
+
+static gint
+tny_camel_mime_part_add_part_default (TnyMimePart *self, TnyMimePart *part)
+{
+        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
+        CamelMedium *medium;
+        CamelDataWrapper *containee;
+        gint curl = 0, retval = 0;
+        CamelMimePart *cpart;
+
+        /* Yes, indeed (I don't yet support non TnyCamelMimePart mime part 
+           instances, and I know I should. Feel free to implement the copying
+           if you really need it) */
+
+        g_assert (TNY_IS_CAMEL_MIME_PART (part));
+
+        g_mutex_lock (priv->part_lock);
+
+        medium = CAMEL_MEDIUM (priv->part);
+        containee = camel_medium_get_content_object (medium);
+
+        /* Warp it into a multipart */
+        if (G_UNLIKELY (!containee) || G_LIKELY (!CAMEL_IS_MULTIPART (containee)))
+        {
+                /* TODO: restore original mime part? */
+                if (G_LIKELY (containee))
+                        camel_object_unref (CAMEL_OBJECT (containee));
+
+                curl = 0;
+
+                containee = (CamelDataWrapper*)camel_multipart_new ();
+                camel_multipart_set_boundary ((CamelMultipart*)containee, NULL);
+                camel_medium_set_content_object (medium, containee);
+        }
+
+        cpart = tny_camel_mime_part_get_part (TNY_CAMEL_MIME_PART (part));
+        camel_multipart_add_part ((CamelMultipart*)containee, cpart);
+        camel_object_unref (CAMEL_OBJECT (cpart));
+
+        retval = camel_multipart_get_number ((CamelMultipart*)containee);
+
+        /* Warning: large lock that locks code, not data */
+        g_mutex_unlock (priv->part_lock);
+
+        return retval;
+}
+
+/* TODO: camel_mime_message_set_date(msg, time(0), 930); */
+
+static void 
+tny_camel_mime_part_del_part (TnyMimePart *self,  TnyMimePart *part)
+{
+        TNY_CAMEL_MIME_PART_GET_CLASS (self)->del_part_func (self, part);
+        return;
+}
+
+static void 
+tny_camel_mime_part_del_part_default (TnyMimePart *self, TnyMimePart *part)
+{
+        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
+        CamelDataWrapper *containee;
+        CamelMimePart *cpart;
+
+        /* Yes, indeed (I don't yet support non TnyCamelMimePart mime part 
+           instances, and I know I should. Feel free to implement the copying
+           if you really need it) */
+
+        g_assert (TNY_IS_CAMEL_MIME_PART (part));
+
+        g_mutex_lock (priv->part_lock);
+
+        containee = camel_medium_get_content_object (CAMEL_MEDIUM (priv->part));
+
+        cpart = tny_camel_mime_part_get_part (TNY_CAMEL_MIME_PART (part));
+        camel_multipart_remove_part (CAMEL_MULTIPART (containee), cpart);
+        camel_object_unref (CAMEL_OBJECT (cpart));
+
+        /* Warning: large lock that locks code, not data */
+        g_mutex_unlock (priv->part_lock);
+
+        return;
+}
+
+
-
-static gboolean 
@@ -675 +846 @@
-        klass->is_attachment_func = tny_camel_mime_part_is_attachment;
-        klass->decode_to_stream_func = tny_camel_mime_part_decode_to_stream;
+        klass->get_parts_func = tny_camel_mime_part_get_parts;
+        klass->add_part_func = tny_camel_mime_part_add_part;
+        klass->del_part_func = tny_camel_mime_part_del_part;
-
-        return;
@@ -704 +878 @@
-        class->is_attachment_func = tny_camel_mime_part_is_attachment_default;
-        class->decode_to_stream_func = tny_camel_mime_part_decode_to_stream_default;
+        class->get_parts_func = tny_camel_mime_part_get_parts_default;
+        class->add_part_func = tny_camel_mime_part_add_part_default;
+        class->del_part_func = tny_camel_mime_part_del_part_default;
-
-        object_class->finalize = tny_camel_mime_part_finalize;

trunk/libtinymail-camel/tny-camel-mime-part.h

@@ -65 +65 @@
-        void (*set_content_type_func) (TnyMimePart *self, const gchar *contenttype);
-        gboolean (*is_attachment_func) (TnyMimePart *self);
+        void (*get_parts_func) (TnyMimePart *self, TnyList *list);
+        void (*del_part_func) (TnyMimePart *self, TnyMimePart *part);
+        gint (*add_part_func) (TnyMimePart *self, TnyMimePart *part);
-};
-

trunk/libtinymail-camel/tny-camel-msg.c

@@ -49 +49 @@
-
-
-typedef gboolean (*CamelPartFunc)(CamelMimeMessage *, CamelMimePart *, void *data);
-
-static gboolean
-message_foreach_part_rec (CamelMimeMessage *msg, CamelMimePart *part, CamelPartFunc callback, void *data)
-{
-        CamelDataWrapper *containee;
-        int parts, i;
-        int go = TRUE;
-        
-        if (callback (msg, part, data) == FALSE)
-                return FALSE;
-        
-        containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-        
-        if (G_UNLIKELY (containee == NULL))
-                return go;
-        
-        if (G_LIKELY (CAMEL_IS_MULTIPART (containee)))
-        {
-                parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
-                for (i = 0; go && i < parts; i++) 
-                {
-                        CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
-                        if (part)
-                                go = message_foreach_part_rec (msg, part, callback, data);
-                        else go = FALSE;
-                }
-                
-        } else if (G_LIKELY (CAMEL_IS_MIME_MESSAGE (containee)))
-                go = message_foreach_part_rec (msg, (CamelMimePart *)containee, callback, data);
-
-        return go;
-}
-
-
-
-CamelMimeMessage* 
-_tny_camel_msg_get_camel_mime_message (TnyCamelMsg *self)
@@ -130 +94 @@
-}
-
-static void
-tny_camel_msg_get_parts (TnyMsg *self, TnyList *list)
-{
-        TNY_CAMEL_MSG_GET_CLASS (self)->get_parts_func (self, list);
-        return;
-}
-
-
-static gboolean
-received_a_part (CamelMimeMessage *message, CamelMimePart *part, void *data)
-{
-        TnyList *list = data;
-        TnyMimePart *tpart;
-
-        if (!part)
-                return FALSE;
-
-/* 
-        Support for RFC822
-
-        CamelContentType *type;
-
-        type = camel_mime_part_get_content_type (part);
-
-        printf ("->%s/%s\n", type->type, type->subtype);
-
-        This seems to be incorrect :( 
-
-        if (camel_content_type_is (type, "message", "rfc822"))
-        {
-                CamelDataWrapper *containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-                if (containee && CAMEL_IS_MIME_MESSAGE (containee))
-                {
-                        TnyCamelHeader *nheader = TNY_CAMEL_HEADER (tny_camel_header_new ());
-
-                        tpart = TNY_MIME_PART (tny_camel_msg_new ());
-                        tny_camel_mime_part_set_part (TNY_CAMEL_MIME_PART (tpart), 
-                                        CAMEL_MIME_PART (containee)); 
-
-                        _tny_camel_header_set_camel_mime_message (nheader, 
-                                        CAMEL_MIME_MESSAGE (containee));
-                        _tny_camel_msg_set_header (TNY_CAMEL_MSG (tpart), nheader);
-
-                        g_object_unref (G_OBJECT (nheader));
-                } else
-                        g_warning ("Can't construct message/rfc822 mime part\n");
-
-        } else
-*/
-                tpart = tny_camel_mime_part_new (part);
-
-        tny_list_prepend (list, (GObject*)tpart);
-        g_object_unref (G_OBJECT (tpart));
-
-        return TRUE;
-}
-
-static void
-tny_camel_msg_get_parts_default (TnyMsg *self, TnyList *list)
-{
-        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self);
-        TnyCamelMimePartPriv *ppriv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
-        gint parts, i;
-        gboolean go = TRUE;
-        CamelDataWrapper *containee;
-        g_assert (TNY_IS_LIST (list));
-
-        g_mutex_lock (priv->parts_lock);
-
-        containee = camel_medium_get_content_object (CAMEL_MEDIUM (ppriv->part));
-
-        if (containee == NULL)
-        {
-                g_warning ("Message has no content\n");
-                return;
-        }
-
-        if (CAMEL_IS_MULTIPART (containee))
-        {
-                parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
-                for (i = 0; go && i < parts; i++) 
-                {
-                                CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
-                                go = received_a_part (CAMEL_MIME_MESSAGE (ppriv->part), part, list);
-                }
-        }
-
-        /* strange camel ... 
-        camel_object_unref (CAMEL_OBJECT (containee));
-
-        Old style ... (recursively)
-        message_foreach_part_rec ((CamelMimeMessage*)ppriv->part, 
-                (CamelMimePart *)ppriv->part, received_a_part, list); */
-
-        g_mutex_unlock (priv->parts_lock);
-
-        return;
-}
-
-
@@ -251 +117 @@
-
-
-static gint
-tny_camel_msg_add_part (TnyMsg *self, TnyMimePart *part)
-{
-        return TNY_CAMEL_MSG_GET_CLASS (self)->add_part_func (self, part);
-}
-
-static gint
-tny_camel_msg_add_part_default (TnyMsg *self, TnyMimePart *part)
-{
-        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self);
-        TnyCamelMimePartPriv *ppriv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
-        CamelMedium *medium;
-        CamelDataWrapper *containee;
-        gint curl = 0, retval = 0;
-        CamelMimePart *cpart;
-
-        /* Yes, indeed (I don't yet support non TnyCamelMimePart mime part 
-           instances, and I know I should. Feel free to implement the copying
-           if you really need it) */
-
-        g_assert (TNY_IS_CAMEL_MIME_PART (part));
-
-        g_mutex_lock (priv->message_lock);
-        g_mutex_lock (ppriv->part_lock);
-
-        medium = CAMEL_MEDIUM (ppriv->part);
-        containee = camel_medium_get_content_object (medium);
-
-        /* Warp it into a multipart */
-        if (G_UNLIKELY (!containee) || G_LIKELY (!CAMEL_IS_MULTIPART (containee)))
-        {
-                /* TODO: restore original mime part? */
-                if (G_LIKELY (containee))
-                        camel_object_unref (CAMEL_OBJECT (containee));
-
-                curl = 0;
-
-                containee = (CamelDataWrapper*)camel_multipart_new ();
-                camel_multipart_set_boundary ((CamelMultipart*)containee, NULL);
-                camel_medium_set_content_object (medium, containee);
-        }
-
-        g_mutex_lock (priv->parts_lock);
-
-        cpart = tny_camel_mime_part_get_part (TNY_CAMEL_MIME_PART (part));
-        camel_multipart_add_part ((CamelMultipart*)containee, cpart);
-        camel_object_unref (CAMEL_OBJECT (cpart));
-
-        retval = camel_multipart_get_number ((CamelMultipart*)containee);
-        g_mutex_unlock (priv->parts_lock);
-
-        /* Warning: large lock that locks code, not data */
-        g_mutex_unlock (ppriv->part_lock);
-        g_mutex_unlock (priv->message_lock);
-
-        return retval;
-}
-
-/* TODO: camel_mime_message_set_date(msg, time(0), 930); */
-
-static void 
-tny_camel_msg_del_part (TnyMsg *self,  TnyMimePart *part)
-{
-        TNY_CAMEL_MSG_GET_CLASS (self)->del_part_func (self, part);
-        return;
-}
-
-static void 
-tny_camel_msg_del_part_default (TnyMsg *self, TnyMimePart *part)
-{
-        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self);
-        TnyCamelMimePartPriv *ppriv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
-        CamelDataWrapper *containee;
-        CamelMimePart *cpart;
-
-        /* Yes, indeed (I don't yet support non TnyCamelMimePart mime part 
-           instances, and I know I should. Feel free to implement the copying
-           if you really need it) */
-
-        g_assert (TNY_IS_CAMEL_MIME_PART (part));
-
-        g_mutex_lock (priv->message_lock);
-
-        containee = camel_medium_get_content_object (CAMEL_MEDIUM (ppriv->part));
-
-        cpart = tny_camel_mime_part_get_part (TNY_CAMEL_MIME_PART (part));
-        camel_multipart_remove_part (CAMEL_MULTIPART (containee), cpart);
-        camel_object_unref (CAMEL_OBJECT (cpart));
-
-        /* Warning: large lock that locks code, not data */
-        g_mutex_unlock (priv->message_lock);
-
-        return;
-}
-
-void
@@ -465 +237 @@
-        TnyMsgIface *klass = (TnyMsgIface *)g;
-
-        klass->get_parts_func = tny_camel_msg_get_parts;
-        klass->get_header_func = tny_camel_msg_get_header;
-        klass->set_header_func = tny_camel_msg_set_header;
-        klass->add_part_func = tny_camel_msg_add_part;
-        klass->del_part_func = tny_camel_msg_del_part;
-        klass->get_folder_func = tny_camel_msg_get_folder;
-
@@ -483 +252 @@
-        object_class = (GObjectClass*) class;
-
-        class->get_parts_func = tny_camel_msg_get_parts_default;
-        class->get_header_func = tny_camel_msg_get_header_default;
-        class->set_header_func = tny_camel_msg_set_header_default;
-        class->add_part_func = tny_camel_msg_add_part_default;
-        class->del_part_func = tny_camel_msg_del_part_default;
-        class->get_folder_func = tny_camel_msg_get_folder_default;
-

trunk/libtinymail-camel/tny-camel-msg.h

@@ -52 +52 @@
-
-        /* virtual methods */
-        void (*get_parts_func) (TnyMsg *self, TnyList *list);
-        TnyHeader* (*get_header_func) (TnyMsg *self);
-        TnyFolder* (*get_folder_func) (TnyMsg *self);
-        void (*set_header_func) (TnyMsg *self, TnyHeader *header);
-        void (*del_part_func) (TnyMsg *self, TnyMimePart *part);
-        gint (*add_part_func) (TnyMsg *self, TnyMimePart *part);
-
-};
-

trunk/libtinymail-test/tny-msg-test.c

@@ -76 +76 @@
-        TnyMimePart *part = TNY_MIME_PART (tny_camel_mime_part_new (cpart));
-    
-sg_add_part (iface
+ime_part_add_part (TNY_MIME_PART (iface)
-
-sg_get_parts (iface
+ime_part_get_parts (TNY_MIME_PART (iface)
-        length = tny_list_get_length (parts);
-        g_object_unref (G_OBJECT (parts));
@@ -88 +88 @@
-
-        parts = tny_simple_list_new ();
-sg_del_part (iface
-sg_get_parts (iface
+ime_part_del_part (TNY_MIME_PART (iface)
+ime_part_get_parts (TNY_MIME_PART (iface)
-        length = tny_list_get_length (parts);
-        g_object_unref (G_OBJECT (parts));

trunk/libtinymail/tny-mime-part.c

@@ -22 +22 @@
-#include <tny-mime-part.h>
-
-
-
-@self: a #TnyMimePart object
-
-Figures out whether or not a mime part is an attachment. An attachmen
-is typically something with a original filename. Examples are attached
-files. Examples that will return FALSE are PGP signatures
+
+
+tny_mime_part_get_parts:
+@self: a #TnyMimePart object
+@list: a #TnyList objec
+
+Get a read-only list of mime-parts of this mime part
- *
- * Example:
@@ -34 +34 @@
- * TnyMsg *message = ...
- * TnyList *parts = tny_simple_list_new ();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * iter = tny_list_create_iterator (parts);
- * while (!tny_iterator_is_done (iter))
@@ -402 +482 @@
- * TnyMsg *message = ...
- * TnyList *parts = tny_simple_list_new ();
-sg_get_parts (message
+ime_part_get_parts (TNY_MIME_PART (message)
- * iter = tny_list_create_iterator (parts);
- * while (!tny_iterator_is_done (iter))

trunk/libtinymail/tny-mime-part.h

@@ -59 +59 @@
-        void (*set_content_type_func) (TnyMimePart *self, const gchar *contenttype);
-        gboolean (*is_attachment_func) (TnyMimePart *self);
+        void (*get_parts_func) (TnyMimePart *self, TnyList *list);
+        void (*del_part_func) (TnyMimePart *self, TnyMimePart *part);
+        gint (*add_part_func) (TnyMimePart *self, TnyMimePart *part);
-};
-
@@ -79 +82 @@
-gboolean tny_mime_part_is_attachment (TnyMimePart *self);
-void tny_mime_part_decode_to_stream (TnyMimePart *self, TnyStream *stream);
+void tny_mime_part_get_parts (TnyMimePart *self, TnyList *list);
+gint tny_mime_part_add_part (TnyMimePart *self, TnyMimePart *part);
+void tny_mime_part_del_part (TnyMimePart *self, TnyMimePart *part);
-
-G_END_DECLS

trunk/libtinymail/tny-msg.c

@@ -44 +44 @@
-
-
-/**
- * tny_msg_get_parts:
- * @self: a #TnyMsg object
- * @list: a #TnyList object
- * 
- * Get a read-only list of mime-parts of this message.
- *
- * Example:
- * <informalexample><programlisting>
- * TnyMsg *message = ...
- * TnyList *parts = tny_simple_list_new ();
- * tny_msg_get_parts (message, parts);
- * iter = tny_list_create_iterator (parts);
- * while (!tny_iterator_is_done (iter))
- * {
- *      TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
- *      g_object_unref (G_OBJECT (part));
- *      tny_iterator_next (iter);
- * }
- * g_object_unref (G_OBJECT (iter));
- * g_object_unref (G_OBJECT (parts));
- * </programlisting></informalexample>
- *
- **/
-void
-tny_msg_get_parts (TnyMsg *self, TnyList *list)
-{
-#ifdef DEBUG
-        if (!TNY_MSG_GET_IFACE (self)->get_parts_func)
-                g_critical ("You must implement tny_msg_get_parts\n");
-#endif
-
-        TNY_MSG_GET_IFACE (self)->get_parts_func (self, list);
-        return;
-}
-
-
@@ -100 +65 @@
-        return TNY_MSG_GET_IFACE (self)->get_header_func (self);
-}
-
-
-/**
- * tny_msg_add_part:
- * @self: a #TnyMsg object
- * @part: the mime-part to add
- * 
- * Add a mime-part to a message
- *
- * Return value: The id of the added mime-part
- *
- **/
-gint
-tny_msg_add_part (TnyMsg *self, TnyMimePart *part)
-{
-#ifdef DEBUG
-        if (!TNY_MSG_GET_IFACE (self)->add_part_func)
-                g_critical ("You must implement tny_msg_add_part\n");
-#endif
-
-        return TNY_MSG_GET_IFACE (self)->add_part_func (self, part);
-}
-
-/**
- * tny_msg_del_part:
- * @self: a #TnyMsg object
- * @part: the mime-part to delete
- * 
- * Delete a mime-part from a message
- *
- **/
-void
-tny_msg_del_part (TnyMsg *self, TnyMimePart *part)
-{
-#ifdef DEBUG
-        if (!TNY_MSG_GET_IFACE (self)->del_part_func)
-                g_critical ("You must implement tny_msg_del_part\n");
-#endif
-
-        TNY_MSG_GET_IFACE (self)->del_part_func (self, part);
-        return;
-}
-
-
-/**

trunk/libtinymail/tny-msg.h

@@ -43 +43 @@
-        GTypeInterface parent;
-
-        void (*get_parts_func) (TnyMsg *self, TnyList *list);
-        TnyHeader* (*get_header_func) (TnyMsg *self);
-        TnyFolder* (*get_folder_func) (TnyMsg *self);
-        void (*set_header_func) (TnyMsg *self, TnyHeader *header);
-        void (*del_part_func) (TnyMsg *self, TnyMimePart *part);
-        gint (*add_part_func) (TnyMsg *self, TnyMimePart *part);
-};
-
-GType tny_msg_get_type (void);
-
-void tny_msg_get_parts (TnyMsg *self, TnyList *list);
-TnyHeader* tny_msg_get_header (TnyMsg *self);
-gint tny_msg_add_part (TnyMsg *self, TnyMimePart *part);
-void tny_msg_del_part (TnyMsg *self, TnyMimePart *part);
-TnyFolder* tny_msg_get_folder (TnyMsg *self);
-void tny_msg_set_header (TnyMsg *self, TnyHeader *header);

trunk/libtinymailui-gtk/tny-gtk-msg-view.c

@@ -61 +61 @@
-struct _TnyGtkMsgViewPriv
-{
- TnyMsg *msg;
+
-        TnyHeaderView *headerview;
-        GtkIconView *attachview;
@@ -86 +86 @@
-
-
+static void tny_gtk_msg_view_display_parts (TnyMsgView *self, TnyList *parts);
-static void remove_mime_part_viewer (TnyMimePartView *mpview, GtkContainer *mpviewers);
-
@@ -317 +318 @@
-{
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-
-msg)?TNY_MSG (g_object_ref (priv->msg
+
+part && TNY_IS_MSG (priv->part))?TNY_MSG (g_object_ref (priv->part
-}
-
@@ -347 +348 @@
-                retval = tny_gtk_text_mime_part_view_new ();
-
-
-
-
+
+
-        {
-                retval = TNY_MIME_PART_VIEW (tny_gtk_msg_view_new ());
@@ -378 +378 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -390 +396 @@
-        RealizePriv *prv = user_data;
-
-
+proxy_func_
-        g_signal_handler_disconnect (widget, prv->signal);
-
-        g_slice_free (RealizePriv, prv);
-}
+
-
-static void
@@ -441 +448 @@
-                                        "realize", G_CALLBACK (on_mpview_realize), prv);
-                        } else
-
+proxy_func_
-                } else if (TNY_IS_GTK_ATTACHMENT_MIME_PART_VIEW (mpview)) 
-
+proxy_func_
-                else if (!TNY_IS_GTK_ATTACHMENT_MIME_PART_VIEW (mpview)) 
-                {
-                        priv->unattached_views = g_list_prepend (priv->unattached_views, mpview);
-
+proxy_func_
-                }
-        }
@@ -469 +476 @@
-}
-
-
+
+
+
+
+
-
-static void 
-tny_gtk_msg_view_set_msg_default (TnyMsgView *self, TnyMsg *msg)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        return;
@@ -526 +511 @@
-        priv->unattached_views = NULL;
-
-msg
-msg
-msg
+part
+part
+part
-}
-
@@ -561 +546 @@
-}
-
+
-static void 
-tny_gtk_msg_view_mp_set_part_default (TnyMimePartView *self, TnyMimePart *part)
@@ -566 +552 @@
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                tny_gtk_msg_view_display_part (TNY_MSG_VIEW (self), part);
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
@@ -623 +629 @@
-        priv->display_plain = TRUE;
-        priv->display_attachments = TRUE;
-FALS
+TRU
-        priv->display_one_body = FALSE;
-
@@ -629 +635 @@
-
-        priv->unattached_views = NULL;
-msg
+part
-
-        gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (self), NULL);
@@ -691 +697 @@
-
-        clear_prv (priv);
-
-        if (G_LIKELY (priv->msg))
-                g_object_unref (G_OBJECT (priv->msg));
-
-        if (G_LIKELY (priv->part))