version and bug fix info update for week 14, 2009 - thursday release

[modest] / src / widgets / modest-gtkhtml-msg-view.c

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 75f4362..2c8d232 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -1096,6 +1096,13 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
        gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
        gtk_widget_set_no_show_all (priv->view_images_button, TRUE);
        priv->attachments_view        = GTK_WIDGET(modest_attachments_view_new (NULL));
+#ifdef MODEST_TOOLKIT_HILDON2
+       modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                          MODEST_ATTACHMENTS_VIEW_STYLE_LINKS);
+#else
+       modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                          MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE);
+#endif
 
        g_signal_connect (G_OBJECT(priv->body_view), "activate_link",
                                       G_CALLBACK(on_activate_link), obj);
@@ -1480,14 +1487,17 @@ on_view_images_clicked (GtkButton * button, gpointer self)
        ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
        TnyMimePart *part;
 
-       modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), TRUE);
-       gtk_widget_hide (priv->view_images_button);
-       part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->body_view));
-       tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), part);
-       tny_msg_set_allow_external_images (TNY_MSG (priv->msg), TRUE);
-       g_object_unref (part);
-       
-
+       /* The message could have not been downloaded yet */
+       if (priv->msg) {
+               modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), TRUE);
+               gtk_widget_hide (priv->view_images_button);
+               part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->body_view));
+               if (part) {
+                       tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), part);
+                       g_object_unref (part);
+               }
+               tny_msg_set_allow_external_images (TNY_MSG (priv->msg), TRUE);
+       }
 }
 
 static gboolean
@@ -1495,7 +1505,7 @@ on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *sel
 {
        gboolean result;
        g_return_val_if_fail (self, FALSE);
-       
+
        g_signal_emit_by_name (G_OBJECT(self), "activate-link", uri, &result);
 
        return result;
@@ -1650,6 +1660,7 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg)
        g_return_if_fail (self);
        
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+       modest_mail_header_view_set_loading (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), FALSE);
        gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
        modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE);
 
@@ -1745,6 +1756,7 @@ set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
        }
        
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+       modest_mail_header_view_set_loading (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), TRUE);
        gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
        modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), FALSE);