Changeset 1213

Timestamp:

11/23/06 20:30:29

Author:

pvanhoof

Message:

Support for rfc822

Files:

• trunk/ChangeLog (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (7 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.h (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-msg-window.c (modified) (6 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-window.h (modified) (1 diff)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (modified) (2 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.h (modified) (1 diff)
• trunk/libtinymailui/tny-msg-view.c (modified) (2 diffs)
• trunk/libtinymailui/tny-msg-view.h (modified) (2 diffs)
• trunk/libtinymailui/tny-msg-window.c (modified) (1 diff)
• trunk/libtinymailui/tny-msg-window.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2006-11-23  Philip van Hoof <pvanhoof@gnome.org>
+
+        * Major fixes and refactoring for the rfc822 support
+        * Reimplemented TnyGtkMsgWindow
+        * Added a tny_msg_view_create_new_mytype API
+
+        * This was a major API change in libtinymailui & libtinymailui-gtk
+
-2006-11-23  Sergio Villar Senin <svillar@igalia.com>
-        * libtinymail-camel/tny-camel-folder.c: added support to rename
@@ -6 +14 @@
-        * libtinymail-gnome-desktop/tny-gnome-account-store.c: removed a small
-        leak
+
+        * This was a major API change in libtinymail
-
-2006-11-21  Sergio Villar Senin <svillar@igalia.com>

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

@@ -323 +323 @@
-
-
+static TnyMsgView*
+tny_gtk_msg_view_create_new_mytype (TnyMsgView *self)
+{
+        return TNY_GTK_MSG_VIEW_GET_CLASS (self)->create_new_mytype_func (self);
+}
+
+static TnyMsgView*
+tny_gtk_msg_view_create_new_mytype_default (TnyMsgView *self)
+{
+        return tny_gtk_msg_view_new ();
+}
+
-static TnyMimePartView*
-tny_gtk_msg_view_create_mime_part_view_for (TnyMsgView *self, TnyMimePart *part)
@@ -351 +363 @@
-        } else if (priv->display_rfc822 && tny_mime_part_content_type_is (part, "message/rfc822"))
-        {
-gtk_msg_view_new (
+msg_view_create_new_mytype (self
-                gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (retval),
-                                        GTK_POLICY_NEVER, GTK_POLICY_NEVER);
@@ -389 +401 @@
-tny_mime_part_view_proxy_func_set_part (TnyMimePartView *mpview, TnyMimePart *part)
-{
-
+
+
+
-                {
-                        TnyList *list = tny_simple_list_new ();
-
-                        if (TNY_IS_MSG (part) && TNY_IS_GTK_MSG_VIEW (mpview))
-                        {
@@ -441 +454 @@
-                        !TNY_IS_GTK_TEXT_MIME_PART_VIEW (mpview))
-                {   
-/* An enhanced HTML component? */
+
-                        if (priv->text_body_viewer)
-                        {
@@ -492 +505 @@
-                        tny_mime_part_view_proxy_func_set_part (mpview, part);
-                }
-
+
+
+
-}
-
@@ -753 +768 @@
-        klass->clear_func = tny_gtk_msg_view_clear;
-        klass->create_mime_part_view_for_func = tny_gtk_msg_view_create_mime_part_view_for;
+        klass->create_new_mytype_func = tny_gtk_msg_view_create_new_mytype;
-
-        return;
@@ -788 +804 @@
-        class->clear_func = tny_gtk_msg_view_clear_default;
-        class->create_mime_part_view_for_func = tny_gtk_msg_view_create_mime_part_view_for_default;
-
+
+
-        g_type_class_add_private (object_class, sizeof (TnyGtkMsgViewPriv));
-

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

@@ -60 +60 @@
-        void (*clear_func) (TnyMsgView *self);
-        TnyMimePartView* (*create_mime_part_view_for_func) (TnyMsgView *self, TnyMimePart *part);
+        TnyMsgView* (*create_new_mytype_func) (TnyMsgView *self);
+
-};
-

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

@@ -91 +91 @@
-}
-
+
+
+
+static void 
+tny_gtk_msg_window_clear (TnyMsgView *self)
+{
+        return TNY_GTK_MSG_WINDOW_GET_CLASS (self)->clear_func (self);
+}
+
+static void 
+tny_gtk_msg_window_clear_default (TnyMsgView *self)
+{
+        TnyGtkMsgWindowPriv *priv = TNY_GTK_MSG_WINDOW_GET_PRIVATE (self);
+
+        tny_msg_view_clear (priv->msg_view);
+
+        return;
+}
+
+static TnyMsgView* 
+tny_gtk_msg_window_create_new_mytype (TnyMsgView *self)
+{
+        return TNY_GTK_MSG_WINDOW_GET_CLASS (self)->create_new_mytype_func (self);
+}
+
+static TnyMsgView* 
+tny_gtk_msg_window_create_new_mytype_default (TnyMsgView *self)
+{
+        TnyGtkMsgWindowPriv *priv = TNY_GTK_MSG_WINDOW_GET_PRIVATE (self);
+
+        /* This should not be a window, but the decorated one, as it has to be 
+           embeddable within a window. So we even decorate this one as usual. */
+
+        return tny_msg_view_create_new_mytype (priv->msg_view);
+}
+
+static TnyMimePartView* 
+tny_gtk_msg_window_create_mime_part_view_for (TnyMsgView *self, TnyMimePart *part)
+{
+        return TNY_GTK_MSG_WINDOW_GET_CLASS (self)->create_mime_part_view_for_func (self, part);
+}
+
+static TnyMimePartView* 
+tny_gtk_msg_window_create_mime_part_view_for_default (TnyMsgView *self, TnyMimePart *part)
+{
+        TnyGtkMsgWindowPriv *priv = TNY_GTK_MSG_WINDOW_GET_PRIVATE (self);
+
+        return tny_msg_view_create_mime_part_view_for (priv->msg_view, part);
+}
+
+
+
+static void 
+tny_gtk_msg_window_mp_clear (TnyMimePartView *self)
+{
+        tny_msg_view_clear (TNY_MSG_VIEW (self));
+
+        return;
+}
+
+
+static void 
+tny_gtk_msg_window_mp_set_part (TnyMimePartView *self, TnyMimePart *part)
+{
+        TNY_GTK_MSG_WINDOW_GET_CLASS (self)->set_part_func (self, part);
+        return;
+}
+
+
+static void 
+tny_gtk_msg_window_mp_set_part_default (TnyMimePartView *self, TnyMimePart *part)
+{
+        TnyGtkMsgWindowPriv *priv = TNY_GTK_MSG_WINDOW_GET_PRIVATE (self);
+
+        tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->msg_view), part);
+
+        return;
+}
+
+
+static TnyMimePart* 
+tny_gtk_msg_window_mp_get_part (TnyMimePartView *self)
+{
+        return TNY_GTK_MSG_WINDOW_GET_CLASS (self)->get_part_func (self);
+}
+
+
+static TnyMimePart* 
+tny_gtk_msg_window_mp_get_part_default (TnyMimePartView *self)
+{
+        TnyGtkMsgWindowPriv *priv = TNY_GTK_MSG_WINDOW_GET_PRIVATE (self);
+
+        return tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->msg_view));
+}
+
+
-/**
- * tny_gtk_msg_window_new:
@@ -128 +224 @@
-tny_gtk_msg_window_finalize (GObject *object)
-{
-        /* Finalization of a GtkWidet removes references */
-
-        (*parent_class->finalize) (object);
-
@@ -136 +230 @@
-
-static void
-gtk_
-
-
-
-
-
-
-gtk_
+
+
+
+
+
+
+
+
-{
-        TnyMsgViewIface *klass = (TnyMsgViewIface *)g;
@@ -150 +244 @@
-        klass->set_msg_func = tny_gtk_msg_window_set_msg;
-        klass->set_unavailable_func = tny_gtk_msg_window_set_unavailable;
+        klass->clear_func = tny_gtk_msg_window_clear;
+
+        return;
+}
+
+static void
+tny_mime_part_view_init (gpointer g, gpointer iface_data)
+{
+        TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
+
+        klass->get_part_func = tny_gtk_msg_window_mp_get_part;
+        klass->set_part_func = tny_gtk_msg_window_mp_set_part;
+        klass->clear_func = tny_gtk_msg_window_mp_clear;
-
-        return;
@@ -165 +272 @@
-        class->set_msg_func = tny_gtk_msg_window_set_msg_default;
-        class->set_unavailable_func = tny_gtk_msg_window_set_unavailable_default;
+        class->clear_func = tny_gtk_msg_window_clear_default;
+        class->create_new_mytype_func = tny_gtk_msg_window_create_new_mytype_default;
+        class->create_mime_part_view_for_func = tny_gtk_msg_window_create_mime_part_view_for_default;
+
+        class->get_part_func = tny_gtk_msg_window_mp_get_part_default;
+        class->set_part_func = tny_gtk_msg_window_mp_set_part_default;
-
-        object_class->finalize = tny_gtk_msg_window_finalize;
@@ -194 +307 @@
-                };
-
-gtk_
+
-                {
-gtk_
+
-                  NULL,         /* interface_finalize */
-                  NULL          /* interface_data */
-                };
-
-gtk_
+
-                {
-gtk_
+
-                  NULL,         /* interface_finalize */
-                  NULL          /* interface_data */
-                };
-
+                static const GInterfaceInfo tny_mime_part_view_info = 
+                {
+                  (GInterfaceInitFunc) tny_mime_part_view_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (GTK_TYPE_WINDOW,
-                        "TnyGtkMsgWindow",
-                        &info, 0);
-
+                g_type_add_interface_static (type, TNY_TYPE_MIME_PART_VIEW, 
+                        &tny_mime_part_view_info);
+
-                g_type_add_interface_static (type, TNY_TYPE_MSG_VIEW, 
-gtk_
+
-
-                g_type_add_interface_static (type, TNY_TYPE_MSG_WINDOW, 
-gtk_
+
-
-        }

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

@@ -59 +59 @@
-        void (*clear_func) (TnyMsgView *self);
-        TnyMimePartView* (*create_mime_part_view_for_func) (TnyMsgView *self, TnyMimePart *part);
+        TnyMsgView* (*create_new_mytype_func) (TnyMsgView *self);
+        TnyMimePart* (*get_part_func) (TnyMimePartView *self);
+        void (*set_part_func) (TnyMimePartView *self, TnyMimePart *part);
-};
-

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

@@ -107 +107 @@
-
-
+
+static TnyMsgView*
+tny_moz_embed_msg_view_create_new_mytype (TnyMsgView *self)
+{
+        return TNY_MOZ_EMBED_MSG_VIEW_GET_CLASS (self)->create_new_mytype_func (self);
+}
+
+static TnyMsgView*
+tny_moz_embed_msg_view_create_new_mytype_default (TnyMsgView *self)
+{
+        return tny_moz_embed_msg_view_new ();
+}
+
+
-static void 
-tny_moz_embed_msg_view_class_init (TnyMozEmbedMsgViewClass *class)
@@ -116 +130 @@
-
-        class->create_mime_part_view_for_func = tny_moz_embed_msg_view_create_mime_part_view_for_default;
+        class->create_new_mytype_func = tny_moz_embed_msg_view_create_new_mytype_default;
-
-        object_class->finalize = tny_moz_embed_msg_view_finalize;
-
-        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)->create_new_mytype_func = tny_moz_embed_msg_view_create_new_mytype;
-
-        return;

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

@@ -49 +49 @@
-        /* virtual methods */
-        TnyMimePartView* (*create_mime_part_view_for_func) (TnyMsgView *self, TnyMimePart *part);
+        TnyMsgView* (*create_new_mytype_func) (TnyMsgView *self);
-};
-

trunk/libtinymailui/tny-msg-view.c

@@ -21 +21 @@
-
-#include <tny-msg-view.h>
+
+/**
+ * tny_msg_view_create_new_mytype:
+ * @self: A #TnyMsgView instance
+ *
+ * Create a new instance of the same type as @self.
+ *
+ * Implementors: This method should create and return a new #TnyMsgView instance 
+ * of the same type as @self. This method will be used when a #TnyMsgView needs
+ * to create a new instance of itself to display inlined messages (like what
+ * message/rfc822 mime parts are). For example the #TnyGtkMsgView implementation
+ * will use this method to create for itself a new #TnyMsgView instance that it
+ * can embed.
+ *
+ * Example:
+ * <informalexample><programlisting>
+ * static TnyMsgView*
+ * tny_my_html_msg_view_create_new_mytype (TnyMsgView *self)
+ * {
+ *    return tny_my_html_msg_view_new ();
+ * }
+ * </programlisting></informalexample>
+ *
+ * Note that if you want to pass contructor parameters, that you will have to
+ * store them yourself (for example in a static global field in the .c file) and
+ * repeat them in the new instance that will be created by this method.
+ *
+ * Return value: A #TnyMsgView instance
+ **/
+TnyMsgView* 
+tny_msg_view_create_new_mytype (TnyMsgView *self)
+{
+#ifdef DEBUG
+        if (!TNY_MSG_VIEW_GET_IFACE (self)->create_new_mytype_func)
+                g_critical ("You must implement tny_msg_view_create_new_mytype\n");
+#endif
+
+        return TNY_MSG_VIEW_GET_IFACE (self)->create_new_mytype_func (self);
+}
-
-/**
@@ -235 +274 @@
-                type = g_type_register_static (G_TYPE_INTERFACE, 
-                        "TnyMsgView", &info, 0);
+
+                g_type_interface_add_prerequisite (type, TNY_TYPE_MIME_PART_VIEW);
+
-        }
-

trunk/libtinymailui/tny-msg-view.h

@@ -47 +47 @@
-        void (*clear_func) (TnyMsgView *self);
-        TnyMimePartView* (*create_mime_part_view_for_func) (TnyMsgView *self, TnyMimePart *part);
+        TnyMsgView* (*create_new_mytype_func) (TnyMsgView *self);
-};
-
@@ -55 +56 @@
-void  tny_msg_view_set_unavailable (TnyMsgView *self);
-TnyMimePartView* tny_msg_view_create_mime_part_view_for (TnyMsgView *self, TnyMimePart *part);
+TnyMsgView* tny_msg_view_create_new_mytype (TnyMsgView *self);
-
-G_END_DECLS

trunk/libtinymailui/tny-msg-window.c

@@ -53 +53 @@
-                  NULL    /* instance_init */
-                };
+
-                type = g_type_register_static (G_TYPE_INTERFACE, 
-                        "TnyMsgWindow", &info, 0);
-
-G_TYPE_OBJECT
+TNY_TYPE_MSG_VIEW
-        }
-

trunk/libtinymailui/tny-msg-window.h

@@ -24 +24 @@
-#include <glib-object.h>
-#include <tny-shared.h>
+#include <tny-msg-view.h>
-
-G_BEGIN_DECLS