Changeset 1293

Timestamp:

12/01/06 11:35:04

Author:

pvanhoof

Message:

Support for RFC822 messages

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (7 diffs)
• trunk/libtinymail-camel/tny-camel-mime-part.h (modified) (1 diff)
• trunk/libtinymail/tny-mime-part.c (modified) (1 diff)
• trunk/libtinymail/tny-mime-part.h (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (12 diffs)

trunk/ChangeLog

@@ +1 @@
+2006-12-01  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Support for content-objects in RFC822 messages
+
+        * This was a major API change
+
-2006-11-30  Sergio Villar Senin <svillar@igalia.com>
-        * libtinymail-camel/tny-camel-common.c: a store query with no items

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

@@ -32 +32 @@
-        CamelMimePart *part;
-        gchar *cached_content_type;
+        TnyMimePart *content_object;
-};
-

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

@@ -96 +96 @@
-}
-
+static void 
+_tny_camel_mime_part_set_content_object (TnyCamelMimePart *self, TnyMimePart *part)
+{
+        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
+        priv->content_object = part;
+}
-
-/** 
@@ -116 +122 @@
-        if (camel_content_type_is (type, "message", "rfc822"))
-        {
-
-
+
-                CamelDataWrapper *rfc822cont = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-
-                if (rfc822cont)
-                        mypart = CAMEL_MIME_PART (rfc822cont);
-                else
-                        mypart = part;
-
-                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), mypart);
+
+                if (rfc822cont)
+                {
+                        TnyMimePart *prt = TNY_MIME_PART (tny_camel_msg_new ());
+                        _tny_camel_mime_part_set_part (TNY_CAMEL_MIME_PART (prt), CAMEL_MIME_PART (rfc822cont));
+                        _tny_camel_mime_part_set_content_object (TNY_CAMEL_MIME_PART (tpart), prt);
+                } else 
+                        _tny_camel_mime_part_set_content_object (TNY_CAMEL_MIME_PART (tpart), NULL);
+
-                if (CAMEL_IS_MIME_MESSAGE (mypart))
-                        _tny_camel_header_set_camel_mime_message (nheader, mypart);
@@ -784 +792 @@
-}
-
+static TnyMimePart* 
+tny_camel_mime_part_get_content_object (TnyMimePart *self)
+{
+        return TNY_CAMEL_MIME_PART_GET_CLASS (self)->get_content_object_func (self);
+}
+
+static TnyMimePart* 
+tny_camel_mime_part_get_content_object_default (TnyMimePart *self)
+{
+        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
+        TnyMimePart *retval = NULL;
+        if (priv->content_object)
+                retval = TNY_MIME_PART (g_object_ref (G_OBJECT (priv->content_object)));
+        return retval;
+}
+
-static void 
-tny_camel_mime_part_set_content_type (TnyMimePart *self, const gchar *content_type)
@@ -822 +846 @@
-        if (G_LIKELY (priv->part) && CAMEL_IS_OBJECT (priv->part))
-                camel_object_unref (CAMEL_OBJECT (priv->part));
+
+        if (priv->content_object)
+                g_object_unref (G_OBJECT (priv->content_object));
-
-        g_mutex_unlock (priv->part_lock);
@@ -877 +904 @@
-        klass->add_part_func = tny_camel_mime_part_add_part;
-        klass->del_part_func = tny_camel_mime_part_del_part;
+        klass->get_content_object_func = tny_camel_mime_part_get_content_object;
-
-        return;
@@ -909 +937 @@
-        class->add_part_func = tny_camel_mime_part_add_part_default;
-        class->del_part_func = tny_camel_mime_part_del_part_default;
+        class->get_content_object_func = tny_camel_mime_part_get_content_object_default;
-
-        object_class->finalize = tny_camel_mime_part_finalize;
@@ -923 +952 @@
-        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
-
+        priv->content_object = NULL;
-        priv->part_lock = g_mutex_new ();
-

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

@@ -69 +69 @@
-        void (*del_part_func) (TnyMimePart *self, TnyMimePart *part);
-        gint (*add_part_func) (TnyMimePart *self, TnyMimePart *part);
+        TnyMimePart* (*get_content_object_func) (TnyMimePart *self);
-};
-

trunk/libtinymail/tny-mime-part.c

@@ -22 +22 @@
-#include <tny-mime-part.h>
-
+
+/**
+ * tny_mime_part_get_content_object:
+ * @self: a #TnyMimePart object
+ * 
+ * Get the content-object in case @self is a RFC822 mime part. If the mime part
+ * isn't a RFC822 one, it will return NULL. Else the return value must be 
+ * unreferenced after use.
+ *
+ * Return value: a #TnyMimePart instance or NULL
+ **/
+TnyMimePart* 
+tny_mime_part_get_content_object (TnyMimePart *self)
+{
+#ifdef DEBUG
+        if (!TNY_MIME_PART_GET_IFACE (self)->get_content_object_func)
+                g_critical ("You must implement tny_mime_part_get_content_object\n");
+#endif
+
+        return TNY_MIME_PART_GET_IFACE (self)->get_content_object_func (self);
+}
-
-/**

trunk/libtinymail/tny-mime-part.h

@@ -62 +62 @@
-        void (*del_part_func) (TnyMimePart *self, TnyMimePart *part);
-        gint (*add_part_func) (TnyMimePart *self, TnyMimePart *part);
+        TnyMimePart* (*get_content_object_func) (TnyMimePart *self);
-};
-
@@ -85 +86 @@
-gint tny_mime_part_add_part (TnyMimePart *self, TnyMimePart *part);
-void tny_mime_part_del_part (TnyMimePart *self, TnyMimePart *part);
+TnyMimePart* tny_mime_part_get_content_object (TnyMimePart *self);
-
-G_END_DECLS

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

@@ -61 +61 @@
-struct _TnyGtkMsgViewPriv
-{
-, *root_part
+
-        TnyHeaderView *headerview;
-        GtkIconView *attachview;
@@ -79 +79 @@
-{
-        gulong signal;
-, *root_part
+
-} RealizePriv;
-
@@ -88 +88 @@
-static void tny_gtk_msg_view_display_parts (TnyMsgView *self, TnyList *parts);
-static void remove_mime_part_viewer (TnyMimePartView *mpview, GtkContainer *mpviewers);
+static void tny_gtk_msg_view_display_part (TnyMsgView *self, TnyMimePart *part);
-
-/**
@@ -434 +435 @@
- **/
-static void
-, TnyMimePart *root_part
+
-{
-                if (tny_mime_part_content_type_is (part, "message/rfc822") && TNY_IS_GTK_MSG_VIEW (mpview))
-                {
+                        TnyMimePart *content_part = tny_mime_part_get_content_object (part);
+
+                        if (!content_part)
+                        {
+                                TnyList *list = tny_simple_list_new ();
+
+                                if (TNY_IS_MSG (part) && TNY_IS_GTK_MSG_VIEW (mpview))
+                                {
+                                        TnyGtkMsgViewPriv *mppriv = TNY_GTK_MSG_VIEW_GET_PRIVATE (mpview);
+                                        TnyHeader *header = TNY_HEADER (tny_msg_get_header (TNY_MSG (part)));
+                                        if (header && TNY_IS_HEADER (header))
+                                        {
+                                                tny_header_view_set_header (mppriv->headerview, header);
+                                                g_object_unref (G_OBJECT (header));
+                                                gtk_widget_show (GTK_WIDGET (mppriv->headerview));
+                                        }
+                                }
+
+                                tny_mime_part_get_parts (part, list);
+                                tny_gtk_msg_view_display_parts (TNY_MSG_VIEW (mpview), list);
+                                g_object_unref (G_OBJECT (list));
+                        } else {
+                                tny_mime_part_view_set_part (mpview, content_part);
+                        }
+                } else if (tny_mime_part_content_type_is (part, "multipart/*") && TNY_IS_GTK_MSG_VIEW (mpview))
+                {
-                        TnyList *list = tny_simple_list_new ();
-                        if (TNY_IS_MSG (part) && TNY_IS_GTK_MSG_VIEW (mpview))
-                        {
-                                TnyGtkMsgViewPriv *mppriv = TNY_GTK_MSG_VIEW_GET_PRIVATE (mpview);
-                                TnyHeader *header = TNY_HEADER (tny_msg_get_header (TNY_MSG (part)));
-                                if (header && TNY_IS_HEADER (header))
-                                {
-                                        tny_header_view_set_header (mppriv->headerview, header);
-                                        g_object_unref (G_OBJECT (header));
-                                        gtk_widget_show (GTK_WIDGET (mppriv->headerview));
-                                }
-                        }
-
-                        tny_mime_part_get_parts (part, list);
-                        tny_gtk_msg_view_display_parts (TNY_MSG_VIEW (mpview), list);
-                        g_object_unref (G_OBJECT (list));
-                } else if (tny_mime_part_content_type_is (part, "multipart/*") && TNY_IS_GTK_MSG_VIEW (mpview))
-                {
-                        if (part != root_part)
-                        {
-                                TnyList *list = tny_simple_list_new ();
-                                tny_mime_part_get_parts (part, list);
-                                tny_gtk_msg_view_display_parts (TNY_MSG_VIEW (mpview), list);
-                                g_object_unref (G_OBJECT (list));
-                        }
-
-                } else
@@ -473 +479 @@
-        RealizePriv *prv = user_data;
-
-, prv->root_part
+
-        g_signal_handler_disconnect (widget, prv->signal);
-        g_object_unref (prv->part);
-        if (prv->root_part)
-                g_object_unref (G_OBJECT (prv->root_part));
-
-        g_slice_free (RealizePriv, prv);
-}
@@ -532 +535 @@
-        }
-
-
-        if (!mpview)
-                mpview = tny_msg_view_create_mime_part_view_for (TNY_MSG_VIEW (self), part);
@@ -544 +546 @@
-                        if (TNY_IS_GTK_MSG_VIEW (mpview) && !GTK_IS_WINDOW (mpview))
-                        {
-
+
+
+
+
+
+
+
-                                gtk_expander_set_expanded (GTK_EXPANDER (expander), FALSE);
-                                gtk_expander_set_spacing (GTK_EXPANDER (expander), 7);
@@ -564 +572 @@
-                                RealizePriv *prv = g_slice_new (RealizePriv);
-                                prv->part = g_object_ref (part);
-                                prv->root_part = priv->part?g_object_ref (G_OBJECT (priv->part)):NULL;
-                                prv->signal = g_signal_connect (G_OBJECT (mpview),
-                                        "realize", G_CALLBACK (on_mpview_realize), prv);
-                        } else
-, priv->part
+
-
-                } else if (TNY_IS_GTK_ATTACHMENT_MIME_PART_VIEW (mpview)) 
-, priv->part
+
-                else if (!TNY_IS_GTK_ATTACHMENT_MIME_PART_VIEW (mpview)) 
-                {
-                        priv->unattached_views = g_list_prepend (priv->unattached_views, mpview);
-, priv->root_part
+
-                }
-        } else if (!tny_mime_part_content_type_is (part, "multipart/*") &&
@@ -583 +590 @@
-                        tny_mime_part_get_content_type (part));
-        }
+
-}
-
@@ -702 +710 @@
-        if (part)
-        {
-                TnyIterator *iterator;
-                TnyList *list;
-
-                g_assert (TNY_IS_MIME_PART (part));
-
@@ -718 +723 @@
-                }
-
-                list = tny_simple_list_new ();
-                priv->part = g_object_ref (G_OBJECT (part));
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -785 +798 @@
-        priv->unattached_views = NULL;
-        priv->part = NULL;
-        priv->root_part = NULL;
-
-        priv->headerview = tny_gtk_header_view_new ();