Build diablo build and fix second line font size and color in maemo and gnome

[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 8b20340..55932a3 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -633,11 +633,13 @@ set_scroll_adjustments (ModestGtkhtmlMsgView *self,
                        GtkAdjustment *hadj,
                        GtkAdjustment *vadj)
 {
-       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
        set_hadjustment (self, hadj);
        set_vadjustment (self, vadj);
 
+#ifndef MODEST_TOOLKIT_HILDON2
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
        gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->body_view), vadj);
+#endif
 }
 
 static void
@@ -1487,14 +1489,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
@@ -1502,7 +1507,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;
@@ -1657,6 +1662,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);
 
@@ -1752,6 +1758,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);