Don't handle zoom keys in ModestWindow, at least in hildon2.2

[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 25a2af7..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
@@ -1660,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);
 
@@ -1755,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);