Changeset 32

Timestamp:

02/09/06 14:46:44

Author:

pvanhoof

Message:

MsgWindowIface?

Files:

• trunk/libtinymailui/Makefile.am (modified) (2 diffs)
• trunk/libtinymailui/tny-msg-window-iface.c (added)
• trunk/libtinymailui/tny-msg-window-iface.h (added)
• trunk/tinymail/tny-msg-window.c (modified) (5 diffs)
• trunk/tinymail/tny-msg-window.h (modified) (2 diffs)
• trunk/tinymail/tny-summary-window.c (modified) (4 diffs)

trunk/libtinymailui/Makefile.am

@@ -8 +8 @@
-        tny-msg-header-list-model.h     \
-        tny-account-tree-model.h        \
-
+
+
-
-libtinymailui_1_0_la_SOURCES =          \
@@ -14 +15 @@
-        tny-msg-header-list-model.c     \
-        tny-account-tree-model.c        \
-
+
+
-
-libtinymailui_1_0_la_LIBADD =           \

trunk/tinymail/tny-msg-window.c

@@ -18 +18 @@
- */
-
+#include <string.h>
-#include <gtk/gtk.h>
-#include <tny-msg-window.h>
-
-static GObjectClass *parent_class = NULL;
+
+typedef struct _TnyMsgWindowPriv TnyMsgWindowPriv;
+
+struct _TnyMsgWindowPriv
+{
+        TnyMsgIface *msg;
+        GtkTextView *textview;
+};
+
+#define TNY_MSG_WINDOW_GET_PRIVATE(o)   \
+        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_MSG_WINDOW_TYPE, TnyMsgWindowPriv))
+
+
+static void
+reload_msg (TnyMsgWindowIface *self)
+{
+        TnyMsgWindowPriv *priv = TNY_MSG_WINDOW_GET_PRIVATE (self);
+        GtkTextBuffer *buffer = gtk_text_view_get_buffer (priv->textview);
+
+        TnyMsgHeaderIface *header;
+        GList *attachments;
+        TnyMsgBodyIface *body;
+        const gchar *text;
+
+        header = TNY_MSG_HEADER_IFACE (tny_msg_iface_get_header (priv->msg));
+        body = TNY_MSG_BODY_IFACE (tny_msg_iface_get_body (priv->msg));
+        attachments = (GList*)tny_msg_iface_get_attachments (priv->msg);
+        text = tny_msg_body_iface_get_data (body);
+
+        gtk_window_set_title (GTK_WINDOW (self), tny_msg_header_iface_get_subject (header));
+        gtk_text_buffer_set_text (buffer, text, strlen(text));
+
+        return;
+}
+
+static void 
+tny_msg_window_set_msg (TnyMsgWindowIface *self, TnyMsgIface *msg)
+{
+        TnyMsgWindowPriv *priv = TNY_MSG_WINDOW_GET_PRIVATE (self);
+
+        if (priv->msg)
+                g_object_unref (G_OBJECT (priv->msg));
+
+        g_object_ref (G_OBJECT (msg));
+
+        priv->msg = msg;
+
+        reload_msg (self);
+
+        return;
+}
-
-
@@ -36 +88 @@
-{
-        TnyMsgWindow *self = (TnyMsgWindow *)instance;
-
+
+
+
+
+
-
-
-
+
-
-        return;
@@ -54 +109 @@
-}
-
+static void
+tny_msg_window_iface_init (gpointer g_iface, gpointer iface_data)
+{
+        TnyMsgWindowIfaceClass *klass = (TnyMsgWindowIfaceClass *)g_iface;
+
+        klass->set_msg_func = tny_msg_window_set_msg;
+
+        return;
+}
-
-static void 
@@ -64 +128 @@
-
-        object_class->finalize = tny_msg_window_finalize;
+
+        g_type_class_add_private (object_class, sizeof (TnyMsgWindowPriv));
-
-        return;
@@ -88 +154 @@
-                };
-
+                static const GInterfaceInfo tny_msg_window_iface_info = 
+                {
+                  (GInterfaceInitFunc) tny_msg_window_iface_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
-                type = g_type_register_static (GTK_TYPE_WINDOW,
-                        "TnyMsgWindow",
-                        &info, 0);
+
+                g_type_add_interface_static (type, TNY_MSG_WINDOW_IFACE_TYPE, 
+                        &tny_msg_window_iface_info);
-
-        }

trunk/tinymail/tny-msg-window.h

@@ -23 +23 @@
-#include <glib-object.h>
-#include <tny-shared.h>
+
+#include <tny-msg-window-iface.h>
+#include <tny-msg-header-iface.h>
+#include <tny-msg-iface.h>
+#include <tny-msg-body-iface.h>
+#include <tny-msg-attachment-iface.h>
-
-G_BEGIN_DECLS
@@ -50 +56 @@
-TnyMsgWindow*       tny_msg_window_new            (void);
-
-
-G_END_DECLS
-

trunk/tinymail/tny-summary-window.c

@@ -27 +27 @@
-#include <tny-account.h>
-
+#include <tny-msg-window-iface.h>
+#include <tny-msg-window.h>
+
-#include <tny-msg-folder-iface.h>
-#include <tny-account-tree-model.h>
@@ -127 +130 @@
-}
-
-static GtkWidget*
-create_msg_window (TnyMsgIface *msg)
-{
-        TnyMsgHeaderIface *header;
-        GList *attachments;
-        TnyMsgBodyIface *body;
-
-        GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-        GtkTextView *textview = GTK_TEXT_VIEW (gtk_text_view_new ());
-        GtkTextBuffer *buffer = gtk_text_view_get_buffer (textview);
-        const gchar *text;
-
-        header = TNY_MSG_HEADER_IFACE (tny_msg_iface_get_header (msg));
-        body = TNY_MSG_BODY_IFACE (tny_msg_iface_get_body (msg));
-        attachments = (GList*)tny_msg_iface_get_attachments (msg);
-        text = tny_msg_body_iface_get_data (body);
-
-
-        gtk_window_set_title (GTK_WINDOW (window), tny_msg_header_iface_get_subject (header));
-        gtk_text_buffer_set_text (buffer, text, strlen(text));
-
-        gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (textview));
-
-        return window;
-}
-
-
-static void
-on_header_view_tree_row_activated (GtkTreeView *treeview, GtkTreePath *path,
@@ -166 +142 @@
-        {
-                TnyMsgHeaderIface *header;
-
-
-
+
-
-                gtk_tree_model_get (model, &iter, 
@@ -190 +164 @@
-                                tny_msg_header_iface_get_subject (TNY_MSG_HEADER_IFACE (nheader)));
-        
-
-
-
+
+
+
+
-                }
-        }