Changeset 984

Timestamp:

10/12/06 23:34:55

Author:

pvanhoof

Message:

The new TnyMimePartView API

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (1 diff)
• trunk/libtinymailui-gtk/Makefile.am (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (19 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.h (modified) (3 diffs)
• trunk/libtinymailui-gtk/tny-gtk-text-mime-part-view.c (added)
• trunk/libtinymailui-gtk/tny-gtk-text-mime-part-view.h (added)
• trunk/libtinymailui-mozembed/Makefile.am (modified) (1 diff)
• trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c (added)
• trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.h (added)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (modified) (7 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.h (modified) (3 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-stream.c (modified) (3 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-stream.h (modified) (1 diff)
• trunk/libtinymailui/tny-mime-part-view.c (modified) (3 diffs)
• trunk/libtinymailui/tny-mime-part-view.h (modified) (2 diffs)
• trunk/libtinymailui/tny-msg-view.c (modified) (2 diffs)
• trunk/libtinymailui/tny-msg-view.h (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2006-10-12  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * The new TnyMimePartView API
+        * The TnyMimePartView API implemented for Gtk+
+        * The TnyMimePartView API implemented for GtkMozEmbed
+
-2006-09-26  Philip Van Hoof <pvanhoof@gnome.org>
-

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

@@ -501 +501 @@
-        TnyCamelMimePart *self = (TnyCamelMimePart*) object;
-        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
-
+
-        g_mutex_lock (priv->part_lock);
-        if (priv->cached_content_type)

trunk/libtinymailui-gtk/Makefile.am

@@ -14 +14 @@
-        tny-gtk-msg-view.h              \
-        tny-gtk-msg-window.h            \
+        tny-gtk-text-mime-part-view.h   \
-        tny-gtk-header-list-model.h     \
-        tny-gtk-folder-tree-model.h     \
@@ -26 +27 @@
-        tny-gtk-save-strategy.c                 \
-        tny-gtk-msg-view.c                      \
+        tny-gtk-text-mime-part-view.c           \
-        tny-gtk-msg-window.c                    \
-        tny-gtk-folder-tree-model.c             \

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

@@ -33 +33 @@
-
-#include <tny-list.h>
+#include <tny-simple-list.h>
-#include <tny-iterator.h>
-
@@ -40 +41 @@
-#include <tny-header-view.h>
-#include <tny-gtk-header-view.h>
+#include <tny-gtk-text-mime-part-view.h>
-
-#ifdef GNOME
@@ -58 +60 @@
-{
-        TnyMsg *msg;
-        GtkTextView *textview;
-        TnyHeaderView *headerview;
-        GtkIconView *attachview;
-        GtkWidget *attachview_sw;
-        TnySaveStrategy *save_strategy;
-};
@@ -68 +67 @@
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_GTK_MSG_VIEW, TnyGtkMsgViewPriv))
-
+
+static TnyMimePartView*
+tny_gtk_msg_view_create_mime_part_view_for (TnyMsgView *self, TnyMimePart *part)
+{
+        return TNY_GTK_MSG_VIEW_GET_CLASS (self)->create_mime_part_view_for_func (self, part);
+}
+
+static TnyMimePartView*
+tny_gtk_msg_view_create_mime_part_view_for_defimpl (TnyMsgView *self, TnyMimePart *part)
+{
+        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
+        TnyMimePartView *retval = NULL;
+
+        if (tny_mime_part_content_type_is (part, "text/*"))
+        {
+                retval = tny_gtk_text_mime_part_view_new (priv->save_strategy);
+                gtk_box_pack_start (GTK_BOX (TNY_GTK_MSG_VIEW (self)->viewers), GTK_WIDGET (retval), TRUE, TRUE, 0);
+                gtk_widget_show (GTK_WIDGET (retval));
+        }
+        
+        return retval;
+}
+
-static void
-reload_msg (TnyMsgView *self)
-{
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-        GtkTextBuffer *buffer;
-        TnyHeader *header;
-        TnyIterator *iterator;
-
-
-
+
+
-        g_return_if_fail (TNY_IS_MSG (priv->msg));
-
@@ -84 +104 @@
-        tny_header_view_set_header (priv->headerview, header);
-        g_object_unref (G_OBJECT (header));
-
-        buffer = gtk_text_view_get_buffer (priv->textview);
-    
-
-
-
-
-
-
-
+
+
+
-        gtk_widget_show (GTK_WIDGET (priv->headerview));
-
@@ -99 +113 @@
-        {
-                TnyMimePart *part = (TnyMimePart*)tny_iterator_get_current (iterator);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                
-                g_object_unref (G_OBJECT(part));
@@ -121 +125 @@
-
-        g_object_unref (G_OBJECT (iterator));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-tny_gtk_msg_view_set_save_strategy (TnyMsgView *self, TnySaveStrategy *strategy)
+{
+        TNY_GTK_MSG_VIEW_GET_CLASS (self)->set_save_strategy_func (self, strategy);
+}
+
+static void
+tny_gtk_msg_view_set_save_strategy_defimpl (TnyMsgView *self, TnySaveStrategy *strategy)
-{
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
@@ -150 +153 @@
-
-static void
-for_each_selected_attachment (GtkIconView *icon_view, GtkTreePath *path
+tny_gtk_msg_view_save_as_activated (GtkMenuItem *menuitem
-{
-        TnyGtkMsgView *self = user_data;
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-        GtkTreeModel *model = gtk_icon_view_get_model (icon_view);
-        GtkTreeIter iter;
-
-        if (!G_LIKELY (priv->save_strategy))
@@ -162 +163 @@
-                return;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
@@ -232 +200 @@
-tny_gtk_msg_view_set_unavailable (TnyMsgView *self)
-{
+        TNY_GTK_MSG_VIEW_GET_CLASS (self)->set_unavailable_func (self);
+}
+
+static void
+tny_gtk_msg_view_set_unavailable_defimpl (TnyMsgView *self)
+{
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-        GtkTextBuffer *buffer;
@@ -241 +215 @@
-        }
-
-        buffer = gtk_text_view_get_buffer (priv->textview);
-        gtk_widget_hide (priv->attachview_sw);
-        gtk_text_buffer_set_text (buffer, _("Message is unavailable"), -1);
-
-        tny_header_view_clear (priv->headerview);
-        gtk_widget_hide (GTK_WIDGET (priv->headerview));
@@ -251 +221 @@
-}
-
+static void
+tny_gtk_msg_view_set_msg (TnyMsgView *self, TnyMsg *msg)
+{
+        TNY_GTK_MSG_VIEW_GET_CLASS (self)->set_msg_func (self, msg);
+}
+
-static void 
-
-
-
-
-
-
-
+
+
+
+
+
+
-        if (msg)
-        {
@@ -270 +245 @@
-
-static void
+remove_mime_part_viewer (TnyMimePartView *mpview, GtkContainer *mpviewers)
+{
+        gtk_container_remove (mpviewers, GTK_WIDGET (mpview));
+        return;
+}
+
+static void
-tny_gtk_msg_view_clear (TnyMsgView *self)
-{
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        tny_header_view_set_header (priv->headerview, NULL);
-        gtk_widget_hide (GTK_WIDGET (priv->headerview));
@@ -307 +299 @@
-        GtkMenu *menu = GTK_MENU (gtk_menu_new ());
-        GtkWidget *mitem = gtk_menu_item_new_with_mnemonic ("Save _As");
-
+
-        priv->save_strategy = NULL;
-
+
-        gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (self), NULL);
-        gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (self), NULL);
@@ -319 +311 @@
-
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), mitem);
-
-        priv->attachview_sw = gtk_scrolled_window_new (NULL, NULL);
-
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self), 
@@ -326 +316 @@
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self),
-                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-
-
-
-
-
-
-
-
-
+
+
-                G_CALLBACK (tny_gtk_msg_view_popup_handler), menu);
-
-        gtk_icon_view_set_text_column (priv->attachview, 
-                TNY_GTK_ATTACH_LIST_MODEL_FILENAME_COLUMN);
-
-        gtk_icon_view_set_pixbuf_column (priv->attachview, 
-                TNY_GTK_ATTACH_LIST_MODEL_PIXBUF_COLUMN);
-
-        gtk_icon_view_set_columns (priv->attachview, -1);
-        gtk_icon_view_set_item_width (priv->attachview, 100);
-        gtk_icon_view_set_column_spacing (priv->attachview, 10);
-
-        priv->headerview = tny_gtk_header_view_new ();
-
-        priv->textview = GTK_TEXT_VIEW (gtk_text_view_new ());
-
-        gtk_text_view_set_editable (priv->textview, FALSE);
-
-        gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->headerview), FALSE, FALSE, 0);
-
-
-
+
+
+
+
+
+
-        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (self), 
-                        GTK_WIDGET (vbox));
-
-        gtk_container_add (GTK_CONTAINER (priv->attachview_sw), GTK_WIDGET (priv->attachview));
-
-        gtk_widget_show (GTK_WIDGET (vbox));
-
-        gtk_widget_hide (GTK_WIDGET (priv->headerview));
-        gtk_widget_show (GTK_WIDGET (priv->textview));
-        gtk_widget_show (GTK_WIDGET (priv->attachview));
-
-        return;
@@ -383 +348 @@
-        if (G_LIKELY (priv->save_strategy))
-                g_object_unref (G_OBJECT (priv->save_strategy));
-
-
-
+
-        (*parent_class->finalize) (object);
-
@@ -400 +363 @@
-        klass->set_unavailable_func = tny_gtk_msg_view_set_unavailable;
-        klass->clear_func = tny_gtk_msg_view_clear;
-
+
+
-        return;
-}
@@ -414 +378 @@
-        object_class->finalize = tny_gtk_msg_view_finalize;
-
+        class->set_msg_func = tny_gtk_msg_view_set_msg_defimpl;
+        class->set_save_strategy_func = tny_gtk_msg_view_set_save_strategy_defimpl;
+        class->set_unavailable_func = tny_gtk_msg_view_set_unavailable_defimpl;
+        class->clear_func = tny_gtk_msg_view_clear_defimpl;
+        class->create_mime_part_view_for_func = tny_gtk_msg_view_create_mime_part_view_for_defimpl;
+        
-        g_type_class_add_private (object_class, sizeof (TnyGtkMsgViewPriv));
-

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

@@ -33 +33 @@
-G_BEGIN_DECLS
-
-
+    
-#define TNY_GTK_MSG_VIEW(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_GTK_MSG_VIEW, TnyGtkMsgView))
-#define TNY_GTK_MSG_VIEW_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_GTK_MSG_VIEW, TnyGtkMsgViewClass))
@@ -46 +46 @@
-{
-        GtkScrolledWindow parent;
-
+
-};
-
@@ -52 +52 @@
-{
-        GtkScrolledWindowClass parent_class;
+        
+        /* virtual methods (they have a default implementation in TnyGtkMsgView */
+        void (*set_msg_func) (TnyMsgView *self, TnyMsg *msg);
+        void (*set_save_strategy_func) (TnyMsgView *self, TnySaveStrategy *strategy);
+        void (*set_unavailable_func) (TnyMsgView *self);
+        void (*clear_func) (TnyMsgView *self);
+        TnyMimePartView* (*create_mime_part_view_for_func) (TnyMsgView *self, TnyMimePart *part);       
-};
-

trunk/libtinymailui-mozembed/Makefile.am

@@ -14 +14 @@
-libtinymailui_mozembed_1_0_headers =             \
-        tny-moz-embed-msg-view.h                 \
+        tny-moz-embed-html-mime-part-view.h     \
-        tny-moz-embed-stream.h
-
-libtinymailui_mozembed_1_0_la_SOURCES =          \
-        $(libtinymailui_mozembed_1_0_headers)    \
+        tny-moz-embed-html-mime-part-view.c      \
-        tny-moz-embed-msg-view.c                 \
-        tny-moz-embed-stream.c

trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c

@@ -20 +20 @@
-#include <config.h>
-#include <glib/gi18n-lib.h>
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include <tny-list.h>
-#include <tny-iterator.h>
-
-#include <tny-moz-embed-msg-view.h>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-static GObjectClass *parent_class = NULL;
@@ -56 +31 @@
-struct _TnyMozEmbedMsgViewPriv
-{
-        TnyMsg *msg;
-        GtkTextView *textview;
-        TnyHeaderView *headerview;
-        GtkMozEmbed *htmlview;
-        
-        GtkIconView *attachview;
-        GtkWidget *attachview_sw;
-        TnySaveStrategy *save_strategy;
-};
-
-  
+ 
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_MOZ_EMBED_MSG_VIEW, TnyMozEmbedMsgViewPriv))
-
-
-static gpointer 
-remove_html_stread_hack (gpointer data)
-{
-        /* Sigh, I don't know why I need this :-(. I think GtkMozEmbed postpones
-           the loading of the document to the very last moment. */
-
-        sleep (5);
-
-        /* This will remove the file in /tmp/ */
-        g_object_unref (G_OBJECT (data));
-
-        return NULL;
-}
-
-static void
-reload_msg (TnyMsgView *self)
-{
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-        GtkTextBuffer *buffer;
-        TnyHeader *header;
-        TnyIterator *iterator;
-        gboolean first_attach = TRUE;
-        GtkTreeModel *model;
-        gboolean have_html = FALSE;
-
-        tny_header_view_clear (TNY_HEADER_VIEW (priv->headerview));
-    
-        g_return_if_fail (TNY_IS_MSG (priv->msg));
-
-        header = TNY_HEADER (tny_msg_get_header (priv->msg));    
-        g_return_if_fail (TNY_IS_HEADER (header));
-        tny_header_view_set_header (priv->headerview, header);
-        g_object_unref (G_OBJECT (header));
-
-        buffer = gtk_text_view_get_buffer (priv->textview);
-    
-        model = tny_gtk_attach_list_model_new ();;
-        tny_msg_get_parts (priv->msg, TNY_LIST (model));
-        iterator = tny_list_create_iterator (TNY_LIST (model));
-        gtk_widget_hide (priv->attachview_sw);
-
-        gtk_text_buffer_set_text (buffer, "", 0);
-        gtk_widget_show (GTK_WIDGET (priv->headerview));
-
-        while (!tny_iterator_is_done (iterator))
-        {
-                TnyMimePart *part = (TnyMimePart*)tny_iterator_get_current (iterator);
-
-                if (!have_html && G_LIKELY (tny_mime_part_content_type_is (part, "text/plain")))
-                {
-                        TnyStream *dest = NULL;
-
-                        gtk_widget_hide (GTK_WIDGET (priv->htmlview));
-                        gtk_widget_show (GTK_WIDGET (priv->textview));
-
-                        dest = tny_gtk_text_buffer_stream_new (buffer);
-
-                        tny_stream_reset (dest);
-                        tny_mime_part_decode_to_stream (part, dest);
-                        tny_stream_reset (dest);
-
-                        g_object_unref (G_OBJECT (dest));
-
-                } else if (G_LIKELY (tny_mime_part_content_type_is (part, "text/html")))
-                {
-                        TnyStream *dest = NULL;
-
-                        dest = TNY_STREAM (tny_moz_embed_stream_new (priv->htmlview));
-
-                        have_html = TRUE;
-
-                        gtk_widget_show (GTK_WIDGET (priv->htmlview));
-                        gtk_widget_hide (GTK_WIDGET (priv->textview));
-
-                        tny_stream_reset (dest);
-                        tny_mime_part_decode_to_stream (part, dest);
-
-                        /* This will do: g_object_unref (G_OBJECT (dest)); */
-                        g_thread_create (remove_html_stread_hack, dest, FALSE, NULL);
-                        
-                } else if (tny_mime_part_get_content_type (part) &&
-                        tny_mime_part_is_attachment (part))
-                {
-                        first_attach = FALSE;
-                }
-                g_object_unref (G_OBJECT(part));
-                
-                tny_iterator_next (iterator);
-        }
-
-        g_object_unref (G_OBJECT (iterator));
-
-        if (G_LIKELY (!first_attach))
-        {
-                gtk_icon_view_set_model (priv->attachview, GTK_TREE_MODEL (model));
-                gtk_widget_show (priv->attachview_sw);
-        }
-
-        g_object_unref (G_OBJECT (model));
-
-        return;
-}
-
-
-void
-tny_mozembed_msg_view_set_save_strategy (TnyMsgView *self, TnySaveStrategy *strategy)
-{
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-
-        if (priv->save_strategy)
-                g_object_unref (G_OBJECT (priv->save_strategy));
-        priv->save_strategy = NULL;
-    
-        g_object_ref (G_OBJECT (strategy));
-        priv->save_strategy = strategy;
-
-        return;
-}
-
-static void
-tny_mozembed_msg_view_set_unavailable (TnyMsgView *self)
-{
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-        GtkTextBuffer *buffer;
-
-        if (G_LIKELY (priv->msg)) 
-        {
-                g_object_unref (G_OBJECT (priv->msg));
-                priv->msg = NULL;
-        }
-    
-        gtk_widget_hide (GTK_WIDGET (priv->htmlview));
-        gtk_widget_show (GTK_WIDGET (priv->textview));
-
-        buffer = gtk_text_view_get_buffer (priv->textview);
-        gtk_widget_hide (priv->attachview_sw);
-        gtk_text_buffer_set_text (buffer, _("Message is unavailable"), -1);
-
-        tny_header_view_clear (priv->headerview);
-        gtk_widget_hide (GTK_WIDGET (priv->headerview));
-
-
-        return;
-}
-
-
-static void
-for_each_selected_attachment (GtkIconView *icon_view, GtkTreePath *path, gpointer user_data)
-{
-        TnyMozEmbedMsgView *self = (TnyMozEmbedMsgView*)user_data;
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-        GtkTreeModel *model = gtk_icon_view_get_model (icon_view);
-        GtkTreeIter iter;
-
-        if (!G_LIKELY (priv->save_strategy))
-        {
-                g_warning (_("No save strategy for this message view\n"));
-                return;
-        }
-
-        if (G_LIKELY (gtk_tree_model_get_iter (model, &iter, path)))
-        {
-                TnyMimePart *part;
-
-                gtk_tree_model_get (model, &iter, 
-                        TNY_GTK_ATTACH_LIST_MODEL_INSTANCE_COLUMN, 
-                        &part, -1);
-
-                if (G_LIKELY (part))
-                {
-                        tny_save_strategy_save (priv->save_strategy, part);    
-                        g_object_unref (G_OBJECT (part));
-                }
-        }
-
-        return;
-}
-
-
-static void
-tny_moz_embed_msg_view_save_as_activated (GtkMenuItem *menuitem, gpointer user_data)
-{
-        TnyMozEmbedMsgView *self = user_data;
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-
-        if (!G_LIKELY (priv->save_strategy))
-        {
-                g_warning (_("No save strategy for this message view\n"));
-                return;
-        }
-
-        gtk_icon_view_selected_foreach (priv->attachview,
-                for_each_selected_attachment, self);
-
-        return;
-}
-
-
-
-static gint
-tny_moz_embed_msg_view_popup_handler (GtkWidget *widget, GdkEvent *event)
-{       
-        g_return_val_if_fail (event != NULL, FALSE);
-        
-        
-        if (G_UNLIKELY (event->type == GDK_BUTTON_PRESS))
-        {
-                GtkMenu *menu;
-                GdkEventButton *event_button;
-
-                menu = GTK_MENU (widget);
-                g_return_val_if_fail (widget != NULL, FALSE);
-                g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
-
-                event_button = (GdkEventButton *) event;
-                if (G_LIKELY (event_button->button == 3))
-                {
-                        gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 
-                                          event_button->button, event_button->time);
-                        return TRUE;
-                }
-        }
-        
-        return FALSE;
-}
-
-static void 
-tny_moz_embed_msg_view_set_msg (TnyMsgView *self, TnyMsg *msg)
-{
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-
-    
-        if (G_LIKELY (priv->msg))
-                g_object_unref (G_OBJECT (priv->msg));
-        priv->msg = NULL;
-    
-        if (msg)
-        {
-                g_object_ref (G_OBJECT (msg));
-                priv->msg = msg;
-                reload_msg (self);
-        }
-}
-
-static void
-tny_moz_embed_msg_view_clear (TnyMsgView *self)
-{
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-
-        GtkTextBuffer *buffer = gtk_text_view_get_buffer (priv->textview);
-        gtk_widget_hide (priv->attachview_sw);
-        gtk_text_buffer_set_text (buffer, "", 0);
-        tny_header_view_clear (priv->headerview);
-        gtk_widget_hide (GTK_WIDGET (priv->headerview));
-    
-        return;
-}
-
-/**
@@ -347 +57 @@
-tny_moz_embed_msg_view_instance_init (GTypeInstance *instance, gpointer g_class)
-{
-        TnyMozEmbedMsgView *self = (TnyMozEmbedMsgView *)instance;
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-        GtkWidget *vbox = gtk_vbox_new (FALSE, 1);
-        GtkMenu *menu = GTK_MENU (gtk_menu_new ());
-        GtkWidget *mitem = gtk_menu_item_new_with_mnemonic ("Save _As");
-
-        priv->save_strategy = NULL;
-        priv->msg = NULL;
-    
-        gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (self), NULL);
-        gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (self), NULL);
-
-        gtk_widget_show (mitem);
-
-        g_signal_connect (G_OBJECT (mitem), "activate", 
-                G_CALLBACK (tny_moz_embed_msg_view_save_as_activated), self);
-
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), mitem);
-
-        priv->attachview_sw = gtk_scrolled_window_new (NULL, NULL);
-
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self), 
-                        GTK_SHADOW_NONE);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self),
-                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-        gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->attachview_sw), 
-                        GTK_SHADOW_NONE);
-        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->attachview_sw),
-                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-        priv->attachview = GTK_ICON_VIEW (gtk_icon_view_new ());
-
-        gtk_icon_view_set_selection_mode (priv->attachview, GTK_SELECTION_SINGLE);
-
-        g_signal_connect_swapped (G_OBJECT (priv->attachview), "button_press_event",
-                G_CALLBACK (tny_moz_embed_msg_view_popup_handler), menu);
-
-        gtk_icon_view_set_text_column (priv->attachview, 
-                TNY_GTK_ATTACH_LIST_MODEL_FILENAME_COLUMN);
-
-        gtk_icon_view_set_pixbuf_column (priv->attachview, 
-                TNY_GTK_ATTACH_LIST_MODEL_PIXBUF_COLUMN);
-
-        gtk_icon_view_set_columns (priv->attachview, -1);
-        gtk_icon_view_set_item_width (priv->attachview, 100);
-        gtk_icon_view_set_column_spacing (priv->attachview, 10);
-
-        priv->headerview = tny_gtk_header_view_new ();
-
-        priv->textview = GTK_TEXT_VIEW (gtk_text_view_new ());
-        priv->htmlview = GTK_MOZ_EMBED (gtk_moz_embed_new ());
-
-        gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->headerview), FALSE, FALSE, 0);
-
-        gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->htmlview), TRUE, TRUE, 0);
-        gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->textview), TRUE, TRUE, 0);        
-
-        gtk_box_pack_start (GTK_BOX (vbox), priv->attachview_sw, FALSE, TRUE, 0);
-
-        gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (self), 
-                        GTK_WIDGET (vbox));
-
-        gtk_container_add (GTK_CONTAINER (priv->attachview_sw), GTK_WIDGET (priv->attachview));
-
-        gtk_widget_show (GTK_WIDGET (vbox));
-
-        gtk_widget_hide (GTK_WIDGET (priv->htmlview));
-        gtk_widget_show (GTK_WIDGET (priv->textview));
-
-        gtk_widget_hide (GTK_WIDGET (priv->headerview));
-        gtk_widget_show (GTK_WIDGET (priv->attachview));
-
-        return;
-}
@@ -425 +63 @@
-tny_moz_embed_msg_view_finalize (GObject *object)
-{
-        TnyMozEmbedMsgView *self = (TnyMozEmbedMsgView *)object;        
-        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
-
-        if (G_LIKELY (priv->msg))
-                g_object_unref (G_OBJECT (priv->msg));
-        priv->msg = NULL;
-    
-        if (G_LIKELY (priv->save_strategy))
-                g_object_unref (G_OBJECT (priv->save_strategy));
-        priv->save_strategy = NULL;
-    
-        /* priv->headerview will be destroyed as a GtkObject */
-    
-        (*parent_class->finalize) (object);
-
@@ -443 +68 @@
-}
-
+static TnyMimePartView*
+tny_moz_embed_msg_view_create_mime_part_view_for (TnyMsgView *self, TnyMimePart *part)
+{
+        TnyMozEmbedMsgViewPriv *priv = TNY_MOZ_EMBED_MSG_VIEW_GET_PRIVATE (self);
+        TnyMimePartView *retval = NULL;
+
+        if (tny_mime_part_content_type_is (part, "text/html"))
+        {
+                retval = tny_moz_embed_html_mime_part_view_new (priv->save_strategy);
+                gtk_box_pack_start (GTK_BOX (TNY_GTK_MSG_VIEW (self)->viewers), GTK_WIDGET (retval), TRUE, TRUE, 0);
+                gtk_widget_show (GTK_WIDGET (retval));
+        }
+
+        if (!retval)
+                retval = TNY_MOZ_EMBED_MSG_VIEW_GET_CLASS (self)->create_mime_part_view_for_orig_func (self, part);
+        
+        return retval;
+}
+
-static void
-sg_view_init (gpointer g, gpointer iface_data
+oz_embed_msg_view_set_save_strategy (TnyMsgView *self, TnySaveStrategy *strategy
-{
-
-
-
-
-
-
-
+
+
+
+
-        return;
-}
+
-
-static void 
@@ -465 +107 @@
-
-        object_class->finalize = tny_moz_embed_msg_view_finalize;
+
+        /* Method overloading */
+        class->create_mime_part_view_for_orig_func = TNY_GTK_MSG_VIEW_CLASS (class)->create_mime_part_view_for_func;
+        class->set_save_strategy_orig_func = TNY_GTK_MSG_VIEW_CLASS (class)->set_save_strategy_func;
+        TNY_GTK_MSG_VIEW_CLASS (class)->create_mime_part_view_for_func = tny_moz_embed_msg_view_create_mime_part_view_for;
+        TNY_GTK_MSG_VIEW_CLASS (class)->set_save_strategy_func = tny_moz_embed_msg_view_set_save_strategy;
-
-        g_type_class_add_private (object_class, sizeof (TnyMozEmbedMsgViewPriv));
@@ -491 +139 @@
-                };
-
-
-
-
-
-
-
-
-
+
-                        "TnyMozEmbedMsgView",
-                        &info, 0);
-
-                g_type_add_interface_static (type, TNY_TYPE_MSG_VIEW, 
-                        &tny_msg_view_info);
-
-        }