Now the "load images" and "details" actions in msg view window are not in the

header view itself. Modified all the layers to support that.

pmo-trunk-r9043

diff --git a/src/gnome/modest-msg-view-window.c b/src/gnome/modest-msg-view-window.c
index e766ab0..1685ebf 100644 (file)
--- a/src/gnome/modest-msg-view-window.c
+++ b/src/gnome/modest-msg-view-window.c
@@ -525,3 +525,22 @@ modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self)
        modest_ui_actions_on_add_to_contacts (NULL, MODEST_WINDOW (self));
 }
 
+void
+modest_msg_view_window_fetch_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       modest_msg_view_request_fetch_images (MODEST_MSG_VIEW (priv->msg_view));
+}
+
+gboolean 
+modest_msg_view_window_has_blocked_external_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+
+       return modest_msg_view_has_blocked_external_images (MODEST_MSG_VIEW (priv->msg_view));
+}

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index c6c3993..ab94245 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -3236,6 +3236,13 @@ setup_menu (ModestMsgViewWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
+
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mail_bd_external_images"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_fetch_images),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_fetch_images));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_ti_message_properties"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_details),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
 }
 
 void
@@ -3319,3 +3326,23 @@ _modest_msg_view_window_map_event (GtkWidget *widget,
 
        return FALSE;
 }
+
+void
+modest_msg_view_window_fetch_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       modest_msg_view_request_fetch_images (MODEST_MSG_VIEW (priv->msg_view));
+}
+
+gboolean 
+modest_msg_view_window_has_blocked_external_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+
+       return modest_msg_view_has_blocked_external_images (MODEST_MSG_VIEW (priv->msg_view));
+}

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 883491d..7c0fee1 100644 (file)
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -3222,3 +3222,22 @@ modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self)
 }
 
 
+void
+modest_msg_view_window_fetch_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       modest_msg_view_request_fetch_images (MODEST_MSG_VIEW (priv->msg_view));
+}
+
+gboolean 
+modest_msg_view_window_has_blocked_external_images (ModestMsgViewWindow *self)
+{
+       ModestMsgViewWindowPrivate *priv;
+       priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE);
+
+       return modest_msg_view_has_blocked_external_images (MODEST_MSG_VIEW (priv->msg_view));
+}

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 77ac1d9..6e067cd 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -6693,3 +6693,13 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window,
        }
        return removed;
 }
+
+void 
+modest_ui_actions_on_fetch_images (GtkAction *action,
+                                  ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
+
+       modest_msg_view_window_fetch_images (MODEST_MSG_VIEW_WINDOW (window));
+
+}

diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h
index 2413195..73971d1 100644 (file)
--- a/src/modest-ui-actions.h
+++ b/src/modest-ui-actions.h
@@ -551,6 +551,9 @@ void modest_ui_actions_transfer_messages_helper (GtkWindow *win,
                                                 TnyList *headers,
                                                 TnyFolder *dst_folder);
 
+void modest_ui_actions_on_fetch_images (GtkAction *action,
+                                       ModestWindow *window);
+
 
 G_END_DECLS
 #endif /* __MODEST_UI_ACTIONS_H__ */

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 9db4991..5b85b05 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -942,6 +942,18 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
        return dimmed;
 }
 
+gboolean
+modest_ui_dimming_rules_on_fetch_images (ModestWindow *win, gpointer user_data)
+{
+       gboolean dimmed = FALSE;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win), FALSE);
+
+       dimmed = !modest_msg_view_window_has_blocked_external_images (MODEST_MSG_VIEW_WINDOW (win));
+
+       return dimmed;
+}
+
 
 gboolean 
 modest_ui_dimming_rules_on_mark_as_read_msg_in_view (ModestWindow *win, gpointer user_data)

diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h
index 5a9663b..d9d1175 100644 (file)
--- a/src/modest-ui-dimming-rules.h
+++ b/src/modest-ui-dimming-rules.h
@@ -53,6 +53,7 @@ gboolean modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_
 gboolean modest_ui_dimming_rules_on_contents_msg (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_always_dimmed (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_fetch_images (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_mark_as_read_msg_in_view (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_mark_as_unread_msg_in_view (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_data);

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index 63924b9..7637dc9 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -79,7 +79,6 @@ static void     get_property (GObject *object, guint prop_id, GValue *value, GPa
 static void on_recpt_activated (ModestMailHeaderView *header_view, const gchar *address, ModestGtkhtmlMsgView *msg_view);
 static void on_show_details (ModestMailHeaderView *header_view, ModestGtkhtmlMsgView *msg_view);
 static void on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_part, gpointer userdata);
-static void on_view_images_clicked (GtkButton * button, gpointer self);
 
 /* body view signals */
 static gboolean on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *msg_view);
@@ -184,6 +183,8 @@ static TnyList *modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView
 static TnyList *modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self);
 static void modest_gtkhtml_msg_view_grab_focus (ModestMsgView *self);
 static void modest_gtkhtml_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment);
+static void modest_gtkhtml_msg_view_request_fetch_images (ModestMsgView *view);
+static gboolean modest_gtkhtml_msg_view_has_blocked_external_images (ModestMsgView *view);
 static GtkAdjustment *modest_gtkhtml_msg_view_get_vadjustment_default (ModestMsgView *self);
 static GtkAdjustment *modest_gtkhtml_msg_view_get_hadjustment_default (ModestMsgView *self);
 static void modest_gtkhtml_msg_view_set_vadjustment_default (ModestMsgView *self, GtkAdjustment *vadj);
@@ -196,6 +197,8 @@ static TnyList *modest_gtkhtml_msg_view_get_selected_attachments_default (Modest
 static TnyList *modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self);
 static void modest_gtkhtml_msg_view_grab_focus_default (ModestMsgView *self);
 static void modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *view, TnyMimePart *attachment);
+static gboolean modest_gtkhtml_msg_view_has_blocked_external_images_default (ModestMsgView *view);
+static void modest_gtkhtml_msg_view_request_fetch_images_default (ModestMsgView *view);
 
 /* internal api */
 static void     set_header     (ModestGtkhtmlMsgView *self, TnyHeader *header);
@@ -218,6 +221,8 @@ static TnyList *get_selected_attachments (ModestGtkhtmlMsgView *self);
 static TnyList *get_attachments (ModestGtkhtmlMsgView *self);
 static void grab_focus (ModestGtkhtmlMsgView *self);
 static void remove_attachment (ModestGtkhtmlMsgView *view, TnyMimePart *attachment);
+static void request_fetch_images (ModestGtkhtmlMsgView *view);
+static gboolean has_blocked_external_images (ModestGtkhtmlMsgView *view);
 
 /* list properties */
 enum {
@@ -419,6 +424,8 @@ modest_gtkhtml_msg_view_class_init (ModestGtkhtmlMsgViewClass *klass)
        klass->get_attachments_func = modest_gtkhtml_msg_view_get_attachments_default;
        klass->grab_focus_func = modest_gtkhtml_msg_view_grab_focus_default;
        klass->remove_attachment_func = modest_gtkhtml_msg_view_remove_attachment_default;
+       klass->request_fetch_images_func = modest_gtkhtml_msg_view_request_fetch_images_default;
+       klass->has_blocked_external_images_func = modest_gtkhtml_msg_view_has_blocked_external_images_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestGtkhtmlMsgViewPrivate));
 
@@ -1090,13 +1097,7 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
 #else
        priv->mail_header_view        = GTK_WIDGET(modest_expander_mail_header_view_new (TRUE));
 #endif
-       priv->view_images_button = gtk_button_new_with_label (_("mail_bd_external_images"));
-#ifdef MODEST_TOOLKIT_HILDON2
-       hildon_gtk_widget_set_theme_size (priv->view_images_button, 
-                                         HILDON_SIZE_HALFSCREEN_WIDTH | HILDON_SIZE_FINGER_HEIGHT);
-#endif
        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),
@@ -1129,9 +1130,6 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
        g_signal_connect (G_OBJECT (priv->attachments_view), "activate",
                          G_CALLBACK (on_attachment_activated), obj);
 
-       g_signal_connect (G_OBJECT (priv->view_images_button), "clicked",
-                         G_CALLBACK (on_view_images_clicked), obj);
-
        html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW(priv->html_scroll));
 
        g_signal_connect (G_OBJECT (html_vadj), "changed",
@@ -1144,19 +1142,6 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
 
        if (priv->mail_header_view)
                gtk_box_pack_start (GTK_BOX(priv->headers_box), priv->mail_header_view, FALSE, FALSE, 0);
-       if (priv->view_images_button) {
-               GtkWidget *hbuttonbox;
-               
-               hbuttonbox = gtk_hbutton_box_new ();
-               gtk_container_add (GTK_CONTAINER (hbuttonbox), priv->view_images_button);
-#ifdef MODEST_TOOLKIT_HILDON2
-               gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_START);
-               gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, TRUE, TRUE, 0);
-#else
-               gtk_box_pack_start (GTK_BOX (priv->headers_box), hbuttonbox, FALSE, FALSE, 0);
-#endif
-               gtk_widget_hide (priv->view_images_button);
-       }
        
        if (priv->attachments_view) {
 #ifndef MODEST_TOOLKIT_HILDON2
@@ -1484,7 +1469,7 @@ on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_par
 }
 
 static void
-on_view_images_clicked (GtkButton * button, gpointer self)
+request_fetch_images (ModestGtkhtmlMsgView *self)
 {
        ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
        TnyMimePart *part;
@@ -1492,7 +1477,6 @@ on_view_images_clicked (GtkButton * button, gpointer self)
        /* 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);
@@ -1503,6 +1487,14 @@ on_view_images_clicked (GtkButton * button, gpointer self)
 }
 
 static gboolean
+has_blocked_external_images (ModestGtkhtmlMsgView *self)
+{
+       ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
+
+       return modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view));
+}
+
+static gboolean
 on_activate_link (GtkWidget *widget, const gchar *uri, ModestGtkhtmlMsgView *self)
 {
        gboolean result;
@@ -1614,8 +1606,6 @@ on_fetch_url (GtkWidget *widget, const gchar *uri,
 
        priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
 
-       if (modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)))
-               gtk_widget_show (priv->view_images_button);
        /*
         * we search for either something starting with cid:, or something
         * with no prefix at all; this latter case occurs when sending mails
@@ -2317,6 +2307,8 @@ modest_msg_view_init (gpointer g, gpointer iface_data)
        klass->get_attachments_func = modest_gtkhtml_msg_view_get_attachments;
        klass->grab_focus_func = modest_gtkhtml_msg_view_grab_focus;
        klass->remove_attachment_func = modest_gtkhtml_msg_view_remove_attachment;
+       klass->request_fetch_images_func = modest_gtkhtml_msg_view_request_fetch_images;
+       klass->has_blocked_external_images_func = modest_gtkhtml_msg_view_has_blocked_external_images;
 
        return;
 }
@@ -2464,3 +2456,27 @@ modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *self, TnyMimeP
 {
        remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment);
 }
+
+static void
+modest_gtkhtml_msg_view_request_fetch_images (ModestMsgView *self)
+{
+       MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->request_fetch_images_func (self);
+}
+
+static void
+modest_gtkhtml_msg_view_request_fetch_images_default (ModestMsgView *self)
+{
+       request_fetch_images (MODEST_GTKHTML_MSG_VIEW (self));
+}
+
+static gboolean
+modest_gtkhtml_msg_view_has_blocked_external_images (ModestMsgView *self)
+{
+       return MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->has_blocked_external_images_func (self);
+}
+
+static gboolean
+modest_gtkhtml_msg_view_has_blocked_external_images_default (ModestMsgView *self)
+{
+       return has_blocked_external_images (MODEST_GTKHTML_MSG_VIEW (self));
+}

diff --git a/src/widgets/modest-gtkhtml-msg-view.h b/src/widgets/modest-gtkhtml-msg-view.h
index 7c0b1a1..9bab604 100644 (file)
--- a/src/widgets/modest-gtkhtml-msg-view.h
+++ b/src/widgets/modest-gtkhtml-msg-view.h
@@ -95,6 +95,8 @@ struct _ModestGtkhtmlMsgViewClass {
        TnyList * (*get_attachments_func) (ModestMsgView *self);
        void (*grab_focus_func) (ModestMsgView *self);
        void (*remove_attachment_func) (ModestMsgView *view, TnyMimePart *attachment);
+       void (*request_fetch_images_func) (ModestMsgView *view);
+       gboolean (*has_blocked_external_images_func) (ModestMsgView *view);
 
        void (*set_scroll_adjustments) (ModestGtkhtmlMsgView *msg_view, GtkAdjustment *hadj, GtkAdjustment *vadj);
 };

diff --git a/src/widgets/modest-mozembed-msg-view.c b/src/widgets/modest-mozembed-msg-view.c
index 8d47941..c398a9a 100644 (file)
--- a/src/widgets/modest-mozembed-msg-view.c
+++ b/src/widgets/modest-mozembed-msg-view.c
@@ -130,6 +130,8 @@ static TnyList *modest_mozembed_msg_view_get_selected_attachments (ModestMsgView
 static TnyList *modest_mozembed_msg_view_get_attachments (ModestMsgView *self);
 static void modest_mozembed_msg_view_grab_focus (ModestMsgView *self);
 static void modest_mozembed_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment);
+static void modest_mozembed_msg_view_request_fetch_images (ModestMsgView *view);
+static gboolean modest_mozembed_msg_view_has_blocked_external_images (ModestMsgView *view);
 static GtkAdjustment *modest_mozembed_msg_view_get_vadjustment_default (ModestMsgView *self);
 static GtkAdjustment *modest_mozembed_msg_view_get_hadjustment_default (ModestMsgView *self);
 static void modest_mozembed_msg_view_set_vadjustment_default (ModestMsgView *self, GtkAdjustment *vadj);
@@ -142,6 +144,8 @@ static TnyList *modest_mozembed_msg_view_get_selected_attachments_default (Modes
 static TnyList *modest_mozembed_msg_view_get_attachments_default (ModestMsgView *self);
 static void modest_mozembed_msg_view_grab_focus_default (ModestMsgView *self);
 static void modest_mozembed_msg_view_remove_attachment_default (ModestMsgView *view, TnyMimePart *attachment);
+static gboolean modest_mozembed_msg_view_has_blocked_external_images_default (ModestMsgView *view);
+static void modest_mozembed_msg_view_request_fetch_images_default (ModestMsgView *view);
 
 /* internal api */
 static void     set_header     (ModestMozembedMsgView *self, TnyHeader *header);
@@ -164,6 +168,8 @@ static TnyList *get_selected_attachments (ModestMozembedMsgView *self);
 static TnyList *get_attachments (ModestMozembedMsgView *self);
 static void grab_focus (ModestMozembedMsgView *self);
 static void remove_attachment (ModestMozembedMsgView *view, TnyMimePart *attachment);
+static void request_fetch_images (ModestMozembedMsgView *view);
+static gboolean has_blocked_external_images (ModestMozembedMsgView *view);
 
 typedef struct _ModestMozembedMsgViewPrivate ModestMozembedMsgViewPrivate;
 struct _ModestMozembedMsgViewPrivate {
@@ -332,6 +338,8 @@ modest_mozembed_msg_view_class_init (ModestMozembedMsgViewClass *klass)
        klass->get_attachments_func = modest_mozembed_msg_view_get_attachments_default;
        klass->grab_focus_func = modest_mozembed_msg_view_grab_focus_default;
        klass->remove_attachment_func = modest_mozembed_msg_view_remove_attachment_default;
+       klass->request_fetch_images_func = modest_mozembed_msg_view_request_fetch_images_default;
+       klass->has_blocked_external_images_func = modest_mozembed_msg_view_has_blocked_external_images_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestMozembedMsgViewPrivate));
 
@@ -533,6 +541,33 @@ on_attachment_activated (ModestAttachmentsView * att_view, TnyMimePart *mime_par
        g_signal_emit_by_name (G_OBJECT(self), "attachment_clicked", mime_part);
 }
 
+
+static void
+request_fetch_images (ModestMozembedMsgView *self)
+{
+       ModestMozembedMsgViewPrivate *priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
+       TnyMimePart *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);
+               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
+has_blocked_external_images (ModestMozembedMsgView *self)
+{
+       ModestMozembedMsgViewPrivate *priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
+
+       return modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view));
+}
+
 static gboolean
 on_activate_link (GtkWidget *widget, const gchar *uri, ModestMozembedMsgView *self)
 {
@@ -1214,6 +1249,8 @@ modest_msg_view_init (gpointer g, gpointer iface_data)
        klass->get_attachments_func = modest_mozembed_msg_view_get_attachments;
        klass->grab_focus_func = modest_mozembed_msg_view_grab_focus;
        klass->remove_attachment_func = modest_mozembed_msg_view_remove_attachment;
+       klass->request_fetch_images_func = modest_mozembed_msg_view_request_fetch_images;
+       klass->has_blocked_external_images_func = modest_mozembed_msg_view_has_blocked_external_images;
 
        return;
 }
@@ -1362,3 +1399,26 @@ modest_mozembed_msg_view_remove_attachment_default (ModestMsgView *self, TnyMime
        remove_attachment (MODEST_MOZEMBED_MSG_VIEW (self), attachment);
 }
 
+static void
+modest_mozembed_msg_view_request_fetch_images (ModestMsgView *self)
+{
+       MODEST_MOZEMBED_MSG_VIEW_GET_CLASS (self)->request_fetch_images_func (self);
+}
+
+static void
+modest_mozembed_msg_view_request_fetch_images_default (ModestMsgView *self)
+{
+       request_fetch_images (MODEST_MOZEMBED_MSG_VIEW (self));
+}
+
+static gboolean
+modest_mozembed_msg_view_has_blocked_external_images (ModestMsgView *self)
+{
+       return MODEST_MOZEMBED_MSG_VIEW_GET_CLASS (self)->has_blocked_external_images_func (self);
+}
+
+static gboolean
+modest_mozembed_msg_view_has_blocked_external_images_default (ModestMsgView *self)
+{
+       return has_blocked_external_images (MODEST_MOZEMBED_MSG_VIEW (self));
+}

diff --git a/src/widgets/modest-mozembed-msg-view.h b/src/widgets/modest-mozembed-msg-view.h
index a0b54aa..ec69e09 100644 (file)
--- a/src/widgets/modest-mozembed-msg-view.h
+++ b/src/widgets/modest-mozembed-msg-view.h
@@ -95,6 +95,8 @@ struct _ModestMozembedMsgViewClass {
        TnyList * (*get_attachments_func) (ModestMsgView *self);
        void (*grab_focus_func) (ModestMsgView *self);
        void (*remove_attachment_func) (ModestMsgView *view, TnyMimePart *attachment);
+       void (*request_fetch_images_func) (ModestMsgView *view);
+       gboolean (*has_blocked_external_images_func) (ModestMsgView *view);
 
        void (*set_scroll_adjustments) (ModestMozembedMsgView *msg_view, GtkAdjustment *hadj, GtkAdjustment *vadj);
 };

diff --git a/src/widgets/modest-msg-view-window.h b/src/widgets/modest-msg-view-window.h
index a141383..fa495db 100644 (file)
--- a/src/widgets/modest-msg-view-window.h
+++ b/src/widgets/modest-msg-view-window.h
@@ -342,6 +342,25 @@ modest_msg_view_window_transfer_mode_enabled (ModestMsgViewWindow *self);
 void
 modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self);
 
+/**
+ * modest_msg_view_window_get_msg_view:
+ * @self: a #ModestMsgViewWindow
+ *
+ * Tells that external images should be fetched in this window.
+ */
+void
+modest_msg_view_window_fetch_images (ModestMsgViewWindow *self);
+
+/**
+ * modest_msg_view_window_has_blocked_external_images:
+ * @self: a #ModestMsgViewWindow
+ * 
+ * checks if the msg currently shown has blocked external images.
+ *
+ * Returns: %TRUE if external images are blocked, %FALSE otherwise
+ */
+gboolean modest_msg_view_window_has_blocked_external_images (ModestMsgViewWindow *self);
+
 G_END_DECLS
 
 #endif /* __MODEST_MSG_VIEW_WINDOW_H__ */

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index ee55d65..ac28fa5 100644 (file)
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -121,6 +121,18 @@ modest_msg_view_remove_attachment (ModestMsgView *self, TnyMimePart *attachment)
        MODEST_MSG_VIEW_GET_IFACE (self)->remove_attachment_func (self, attachment);
 }
 
+void
+modest_msg_view_request_fetch_images (ModestMsgView *self)
+{
+       MODEST_MSG_VIEW_GET_IFACE (self)->request_fetch_images_func (self);
+}
+
+gboolean
+modest_msg_view_has_blocked_external_images (ModestMsgView *self)
+{
+       return MODEST_MSG_VIEW_GET_IFACE (self)->has_blocked_external_images_func (self);
+}
+
 static void
 modest_msg_view_base_init (gpointer g_class)
 {

diff --git a/src/widgets/modest-msg-view.h b/src/widgets/modest-msg-view.h
index c977650..2edea8c 100644 (file)
--- a/src/widgets/modest-msg-view.h
+++ b/src/widgets/modest-msg-view.h
@@ -82,6 +82,9 @@ struct _ModestMsgViewIface {
        gboolean (*fetch_image)    (ModestMsgView *msgview, const gchar *uri,
                                    TnyStream *stream);
        void (*show_details)       (ModestMsgView *msgview, gpointer userdata);
+
+       void (*request_fetch_images_func) (ModestMsgView *msgview);
+       gboolean (*has_blocked_external_images_func) (ModestMsgView *msgview);
 };
 
 
@@ -110,6 +113,8 @@ TnyList *modest_msg_view_get_attachments (ModestMsgView *self);
 void modest_msg_view_grab_focus (ModestMsgView *self);
 void modest_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment);
 void modest_msg_view_set_view_images (ModestMsgView *view, gboolean view_images);
+void modest_msg_view_request_fetch_images (ModestMsgView *view);
+gboolean modest_msg_view_has_blocked_external_images (ModestMsgView *view);
 
 
 G_END_DECLS