From 61ab7deeea2e62ec29ee6b4710f9b097fab233c4 Mon Sep 17 00:00:00 2001 From: Nils Faerber Date: Mon, 12 Jun 2006 16:05:49 +0000 Subject: [PATCH] * more implementation on message viewer * start of first interface function to create a message viewer instance and window pmo-trunk-r237 --- src/gtk-glade/modest-ui-message-viewer.c | 2 +- src/modest-ui.h | 4 ++-- src/modest-viewer-window.c | 13 ++++++++++--- src/modest-viewer-window.h | 3 ++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/gtk-glade/modest-ui-message-viewer.c b/src/gtk-glade/modest-ui-message-viewer.c index 7906f18..0dc358b 100644 --- a/src/gtk-glade/modest-ui-message-viewer.c +++ b/src/gtk-glade/modest-ui-message-viewer.c @@ -41,7 +41,7 @@ typedef struct { GtkContainer -*modest_ui_new_viewer_window (ModestUI *modest_ui, gpointer *user_data) +*modest_ui_new_viewer_window (ModestUI *modest_ui, GtkWidget *msg_view, TnyMsgIface *msg, gpointer *user_data) { GtkWidget *top_container; GladeXML *glade_xml; diff --git a/src/modest-ui.h b/src/modest-ui.h index 584d11c..b1ff8c3 100644 --- a/src/modest-ui.h +++ b/src/modest-ui.h @@ -7,7 +7,7 @@ #include #include #include "modest-conf.h" - +#include "modest-tny-msg-view.h" G_BEGIN_DECLS @@ -95,7 +95,7 @@ gboolean modest_ui_editor_window_set_subject_header(const gchar *subject, gpoint gboolean modest_ui_editor_window_set_body(const gchar *body, gpointer window_data); gboolean modest_ui_editor_window_update_attachments(gpointer window_data); -GtkContainer *modest_ui_new_viewer_window (ModestUI *modest_ui, gpointer *user_data); +GtkContainer *modest_ui_new_viewer_window (ModestUI *modest_ui, GtkWidget *msg_view, TnyMsgIface *msg, gpointer *user_data); G_END_DECLS diff --git a/src/modest-viewer-window.c b/src/modest-viewer-window.c index 9e16e20..02d3c6d 100644 --- a/src/modest-viewer-window.c +++ b/src/modest-viewer-window.c @@ -3,8 +3,9 @@ /* insert (c)/licensing information) */ #include "modest-ui.h" +#include "modest-tny-msg-view.h" #include "modest-viewer-window.h" -/* include other impl specific header files */ + /* 'private'/'protected' functions */ static void modest_viewer_window_class_init (ModestViewerWindowClass *klass); @@ -18,6 +19,7 @@ enum { typedef struct _ModestViewerWindowPrivate ModestViewerWindowPrivate; struct _ModestViewerWindowPrivate { + ModestTnyMsgView *msg_view; gpointer user_data; }; #define MODEST_VIEWER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -96,18 +98,21 @@ modest_viewer_window_finalize (GObject *obj) GtkWidget* -modest_viewer_window_new (ModestUI *ui) +modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg) { GObject *self; ModestViewerWindowPrivate *priv; GtkWidget *w; gpointer data; + GtkWidget *msg_view; self = G_OBJECT(g_object_new(MODEST_TYPE_VIEWER_WINDOW, NULL)); priv = MODEST_VIEWER_WINDOW_GET_PRIVATE(self); + msg_view = modest_tny_msg_view_new(msg, FALSE); + data = NULL; - w = GTK_WIDGET(modest_ui_new_viewer_window(ui, &data)); + w = GTK_WIDGET(modest_ui_new_viewer_window(ui, msg_view, msg, &data)); if (!w) return NULL; if (!data) @@ -137,3 +142,5 @@ gpointer modest_viewer_window_get_data(ModestViewerWindow *viewer_win) return priv->user_data; } + + diff --git a/src/modest-viewer-window.h b/src/modest-viewer-window.h index 3f2f876..92d6cdc 100644 --- a/src/modest-viewer-window.h +++ b/src/modest-viewer-window.h @@ -37,7 +37,8 @@ GType modest_viewer_window_get_type (void) G_GNUC_CONST; /* typical parameter-less _new function */ /* if this is a kind of GtkWidget, it should probably return at GtkWidget*, */ /* otherwise probably a GObject*. */ -GtkWidget* modest_viewer_window_new (ModestUI *ui); +GtkWidget* modest_viewer_window_new (ModestUI *ui, TnyMsgIface *msg); + /* fill in other public functions, eg.: */ /* void modest_viewer_window_do_something (ModestViewerWindow *self, const gchar* param); */ -- 1.7.9.5