#include <modest-tny-msg.h>
#include <modest-text-utils.h>
#include <widgets/modest-msg-view.h>
-#include <widgets/modest-mail-header-view.h>
+#include <widgets/modest-compact-mail-header-view.h>
#include <widgets/modest-attachments-view.h>
#include <modest-marshal.h>
#include <widgets/modest-isearch-view.h>
/* 'private'/'protected' functions */
static void modest_mozembed_msg_view_class_init (ModestMozembedMsgViewClass *klass);
+static void tny_header_view_init (gpointer g, gpointer iface_data);
static void tny_msg_view_init (gpointer g, gpointer iface_data);
static void tny_mime_part_view_init (gpointer g, gpointer iface_data);
static void modest_mime_part_view_init (gpointer g, gpointer iface_data);
ModestMozembedMsgView *msg_view);
static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMozembedMsgView *msg_view);
-#ifdef MAEMO_CHANGES
+#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP
static void on_tap_and_hold (GtkWidget *widget, gpointer userdata);
-#endif /*MAEMO_CHANGES*/
+#endif /*HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP*/
/* TnyMimePartView implementation */
static void modest_msg_view_mp_clear (TnyMimePartView *self);
/* ModestMimePartView implementation */
static gboolean modest_msg_view_mp_is_empty (ModestMimePartView *self);
static gboolean modest_msg_view_mp_is_empty_default (ModestMimePartView *self);
+/* TnyHeaderView implementation */
+static void modest_msg_view_set_header (TnyHeaderView *self, TnyHeader *header);
+static void modest_msg_view_set_header_default (TnyHeaderView *self, TnyHeader *header);
+static void modest_msg_view_clear_header (TnyHeaderView *self);
+static void modest_msg_view_clear_header_default (TnyHeaderView *self);
/* TnyMsgView implementation */
static TnyMsg *modest_msg_view_get_msg (TnyMsgView *self);
static TnyMsg *modest_msg_view_get_msg_default (TnyMsgView *self);
static GtkShadowType modest_mozembed_msg_view_get_shadow_type (ModestMsgView *self);
static TnyHeaderFlags modest_mozembed_msg_view_get_priority (ModestMsgView *self);
static void modest_mozembed_msg_view_set_priority (ModestMsgView *self, TnyHeaderFlags flags);
-static GList *modest_mozembed_msg_view_get_selected_attachments (ModestMsgView *self);
-static GList *modest_mozembed_msg_view_get_attachments (ModestMsgView *self);
+static TnyList *modest_mozembed_msg_view_get_selected_attachments (ModestMsgView *self);
+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);
static GtkShadowType modest_mozembed_msg_view_get_shadow_type_default (ModestMsgView *self);
static TnyHeaderFlags modest_mozembed_msg_view_get_priority_default (ModestMsgView *self);
static void modest_mozembed_msg_view_set_priority_default (ModestMsgView *self, TnyHeaderFlags flags);
-static GList *modest_mozembed_msg_view_get_selected_attachments_default (ModestMsgView *self);
-static GList *modest_mozembed_msg_view_get_attachments_default (ModestMsgView *self);
+static TnyList *modest_mozembed_msg_view_get_selected_attachments_default (ModestMsgView *self);
+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);
static TnyMsg *get_message (ModestMozembedMsgView *self);
static void set_message (ModestMozembedMsgView *self, TnyMsg *tny_msg);
static gboolean is_empty (ModestMozembedMsgView *self);
static GtkShadowType get_shadow_type (ModestMozembedMsgView *self);
static TnyHeaderFlags get_priority (ModestMozembedMsgView *self);
static void set_priority (ModestMozembedMsgView *self, TnyHeaderFlags flags);
-static GList *get_selected_attachments (ModestMozembedMsgView *self);
-static GList *get_attachments (ModestMozembedMsgView *self);
+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 {
/* link click management */
gchar *last_url;
- TnyHeaderFlags priority_flags;
};
#define MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
NULL /* interface_data */
};
+ static const GInterfaceInfo tny_header_view_info =
+ {
+ (GInterfaceInitFunc) tny_header_view_init, /* interface_init */
+ NULL, /* interface_finalize */
+ NULL /* interface_data */
+ };
+
static const GInterfaceInfo modest_mime_part_view_info =
{
(GInterfaceInitFunc) modest_mime_part_view_init, /* interface_init */
"ModestMozembedMsgView",
&my_info, 0);
+ g_type_add_interface_static (my_type, TNY_TYPE_HEADER_VIEW,
+ &tny_header_view_info);
+
g_type_add_interface_static (my_type, TNY_TYPE_MIME_PART_VIEW,
&tny_mime_part_view_info);
gobject_class->finalize = modest_mozembed_msg_view_finalize;
gtkobject_class->destroy = modest_mozembed_msg_view_destroy;
+ klass->set_header_func = modest_msg_view_set_header_default;
+ klass->clear_header_func = modest_msg_view_clear_header_default;
klass->set_scroll_adjustments = NULL;
klass->get_part_func = modest_msg_view_mp_get_part_default;
klass->set_part_func = modest_msg_view_mp_set_part_default;
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));
GtkWidget *separator;
GtkWidget *main_vbox;
GtkWidget *scroll_area;
- GtkWidget *viewport;
GtkWidget *body_box;
priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(obj);
priv->current_zoom = 1.0;
- priv->priority_flags = 0;
priv->body_view = GTK_WIDGET (g_object_new (MODEST_TYPE_MOZEMBED_MIME_PART_VIEW, NULL));
- priv->mail_header_view = GTK_WIDGET(modest_mail_header_view_new (TRUE));
+ priv->mail_header_view = GTK_WIDGET(modest_compact_mail_header_view_new (TRUE));
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
priv->attachments_view = GTK_WIDGET(modest_attachments_view_new (NULL));
gtk_box_pack_start (GTK_BOX(priv->headers_box), priv->mail_header_view, FALSE, FALSE, 0);
if (priv->attachments_view) {
+#ifndef MODEST_TOOLKIT_HILDON2
gchar *att_label = g_strconcat (_("mcen_me_viewer_attachments"), ":", NULL);
+#else
+ gchar *att_label = g_strconcat (_("mail_va_attachment"), ":", NULL);
+#endif
priv->attachments_box = (GtkWidget *)
modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view),
gtk_box_pack_start (GTK_BOX (main_vbox), body_box, TRUE, TRUE, 0);
if (priv->body_view) {
-/* viewport = gtk_viewport_new (NULL, NULL); */
-/* gtk_widget_set_size_request (priv->body_view, -1, 300); */
-/* gtk_container_add (GTK_CONTAINER (viewport), priv->body_view); */
-/* gtk_widget_show_all (viewport); */
-/* scroll_area = modest_scroll_area_new (GTK_WIDGET (obj), viewport); */
-/* gtk_container_add (GTK_CONTAINER (frame), scroll_area); */
-
- gtk_container_add (GTK_CONTAINER (body_box), priv->body_view);
- scroll_area = NULL;
- viewport = NULL;
-
-#ifdef MAEMO_CHANGES
+ /* gtk_widget_set_size_request (priv->body_view, 610, 1000); */
+ /* scroll_area = modest_scroll_area_new (GTK_WIDGET (obj), priv->body_view); */
+ /* gtk_container_add (GTK_CONTAINER (body_box), scroll_area); */
+
+ /* gtk_container_add (GTK_CONTAINER (body_box), priv->body_view); */
+ /* scroll_area = NULL; */
+
+ scroll_area = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_area), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll_area), priv->body_view);
+ gtk_box_pack_start (GTK_BOX (body_box), scroll_area, TRUE, TRUE, 0);
+ gtk_widget_show_all (body_box);
+
+#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP
gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->body_view), NULL, NULL, 0);
g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold", G_CALLBACK (on_tap_and_hold), obj);
#endif
return GTK_WIDGET(self);
}
-#ifdef MAEMO_CHANGES
+#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP
static void
on_tap_and_hold (GtkWidget *widget,
gpointer data)
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)
{
result = FALSE;
} else {
tny_mime_part_decode_to_stream ((TnyMimePart*)part,
- stream);
+ stream, NULL);
g_object_unref (G_OBJECT(part));
result = TRUE;
}
}
+static void
+set_header (ModestMozembedMsgView *self, TnyHeader *header)
+{
+ ModestMozembedMsgViewPrivate *priv;
+
+ g_return_if_fail (self);
+
+ if (header == NULL)
+ set_message (self, NULL);
+
+ priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(self);
+ gtk_widget_set_no_show_all (priv->mail_header_view, FALSE);
+
+ if (priv->msg)
+ g_object_unref (G_OBJECT(priv->msg));
+ priv->msg = NULL;
+
+ tny_header_view_set_header (TNY_HEADER_VIEW (priv->mail_header_view), header);
+ modest_attachments_view_set_message (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), NULL);
+ gtk_widget_show_all (priv->mail_header_view);
+ gtk_widget_hide_all (priv->attachments_box);
+ gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
+ tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
+}
+
static TnyMsg*
get_message (ModestMozembedMsgView *self)
priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
- return priv->priority_flags;
+ return modest_mail_header_view_get_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view));
}
static void
g_return_if_fail (MODEST_IS_MOZEMBED_MSG_VIEW (self));
priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
- priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
-
modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
}
return result;
}
-static GList *
+static TnyList *
get_selected_attachments (ModestMozembedMsgView *self)
{
ModestMozembedMsgViewPrivate *priv;
}
-static GList *
+static TnyList *
get_attachments (ModestMozembedMsgView *self)
{
ModestMozembedMsgViewPrivate *priv;
}
+/* TNY HEADER VIEW IMPLEMENTATION */
+
+static void
+tny_header_view_init (gpointer g, gpointer iface_data)
+{
+ TnyHeaderViewIface *klass = (TnyHeaderViewIface *)g;
+
+ klass->set_header = modest_msg_view_set_header;
+ klass->clear = modest_msg_view_clear_header;
+
+ return;
+}
+
+static void
+modest_msg_view_set_header (TnyHeaderView *self, TnyHeader *header)
+{
+ MODEST_MOZEMBED_MSG_VIEW_GET_CLASS (self)->set_header_func (self, header);
+}
+
+
+static void
+modest_msg_view_set_header_default (TnyHeaderView *self, TnyHeader *header)
+{
+ set_header (MODEST_MOZEMBED_MSG_VIEW (self), header);
+}
+
+static void
+modest_msg_view_clear_header (TnyHeaderView *self)
+{
+ MODEST_MOZEMBED_MSG_VIEW_GET_CLASS (self)->clear_header_func (self);
+}
+
+
+static void
+modest_msg_view_clear_header_default (TnyHeaderView *self)
+{
+ set_message (MODEST_MOZEMBED_MSG_VIEW (self), NULL);
+}
+
/* TNY MSG IMPLEMENTATION */
static void
{
TnyMsgViewIface *klass = (TnyMsgViewIface *)g;
- klass->get_msg_func = modest_msg_view_get_msg;
- klass->set_msg_func = modest_msg_view_set_msg;
- klass->set_unavailable_func = modest_msg_view_set_unavailable;
- klass->clear_func = modest_msg_view_clear;
- klass->create_mime_part_view_for_func = modest_msg_view_create_mime_part_view_for;
- klass->create_new_inline_viewer_func = modest_msg_view_create_new_inline_viewer;
+ klass->get_msg = modest_msg_view_get_msg;
+ klass->set_msg = modest_msg_view_set_msg;
+ klass->set_unavailable = modest_msg_view_set_unavailable;
+ klass->clear = modest_msg_view_clear;
+ klass->create_mime_part_view_for = modest_msg_view_create_mime_part_view_for;
+ klass->create_new_inline_viewer = modest_msg_view_create_new_inline_viewer;
return;
}
{
TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
- klass->get_part_func = modest_msg_view_mp_get_part;
- klass->set_part_func = modest_msg_view_mp_set_part;
- klass->clear_func = modest_msg_view_mp_clear;
+ klass->get_part = modest_msg_view_mp_get_part;
+ klass->set_part = modest_msg_view_mp_set_part;
+ klass->clear = modest_msg_view_mp_clear;
return;
}
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;
}
return get_priority (MODEST_MOZEMBED_MSG_VIEW (self));
}
-static GList*
+static TnyList*
modest_mozembed_msg_view_get_selected_attachments (ModestMsgView *self)
{
return MODEST_MOZEMBED_MSG_VIEW_GET_CLASS (self)->get_selected_attachments_func (self);
}
-static GList*
+static TnyList*
modest_mozembed_msg_view_get_selected_attachments_default (ModestMsgView *self)
{
return get_selected_attachments (MODEST_MOZEMBED_MSG_VIEW (self));
}
-static GList*
+static TnyList*
modest_mozembed_msg_view_get_attachments (ModestMsgView *self)
{
return MODEST_MOZEMBED_MSG_VIEW_GET_CLASS (self)->get_attachments_func (self);
}
-static GList*
+static TnyList*
modest_mozembed_msg_view_get_attachments_default (ModestMsgView *self)
{
return get_attachments (MODEST_MOZEMBED_MSG_VIEW (self));
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));
+}
projects / modest / blobdiff