2007-04-06 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / modest-msg-view-window.c

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 46cd8dc..8ec5cd4 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -161,11 +161,13 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
        GtkWidget *main_vbox;
        ModestMsgViewWindowPrivate *priv;
        ModestWindowPrivate *parent_priv;
+       GtkWidget *scrolled_window;
        
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
        priv->msg_view = modest_msg_view_new (msg);
+       modest_msg_view_set_shadow_type (MODEST_MSG_VIEW (priv->msg_view), GTK_SHADOW_NONE);
        main_vbox = gtk_vbox_new  (FALSE, 6);
 
        /* Toolbar / Menubar */
@@ -178,7 +180,12 @@ init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
        gtk_widget_show_all (GTK_WIDGET(parent_priv->toolbar));
        hildon_window_add_toolbar (HILDON_WINDOW(obj), GTK_TOOLBAR(parent_priv->toolbar));
 
-       gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_view, TRUE, TRUE, 6);
+       scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_NONE);
+
+       gtk_container_add (GTK_CONTAINER (scrolled_window), priv->msg_view);
+       gtk_box_pack_start (GTK_BOX(main_vbox), scrolled_window, TRUE, TRUE, 6);
        gtk_container_add   (GTK_CONTAINER(obj), main_vbox);
        
        gtk_widget_show_all (GTK_WIDGET(main_vbox));
@@ -251,6 +258,15 @@ modest_msg_view_window_new (TnyMsg *msg, const gchar *account_name)
 
        g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj);
 
+       g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
+                         G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj);
+       g_signal_connect (G_OBJECT(priv->msg_view), "link_hover",
+                         G_CALLBACK (modest_ui_actions_on_msg_link_hover), obj);
+       g_signal_connect (G_OBJECT(priv->msg_view), "attachment_clicked",
+                         G_CALLBACK (modest_ui_actions_on_msg_attachment_clicked), obj);
+       g_signal_connect (G_OBJECT(priv->msg_view), "recpt-activate",
+                         G_CALLBACK (modest_ui_actions_on_msg_recpt_activated), obj);
+
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
        return MODEST_WINDOW(obj);
 }
@@ -260,10 +276,14 @@ modest_msg_view_window_new (TnyMsg *msg, const gchar *account_name)
 TnyMsg*
 modest_msg_view_window_get_message (ModestMsgViewWindow *self)
 {
-       ModestMsgView *msg_view;        
+       ModestMsgView *msg_view;
+       ModestMsgViewWindowPrivate *priv;
+
        g_return_val_if_fail (self, NULL);
 
-       msg_view = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj)->msg_view;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+
+       msg_view = MODEST_MSG_VIEW (priv->msg_view);
 
        return modest_msg_view_get_message (msg_view);
 }