#include <widgets/modest-isearch-view.h>
#include <widgets/modest-ui-constants.h>
#include <modest-icon-names.h>
+#include <tny-camel-bs-mime-part.h>
+#include <modest-runtime.h>
/* FIXNE: we should have no maemo-deps in widgets/ */
#ifndef MODEST_TOOLKIT_GTK
static void request_fetch_images (ModestGtkhtmlMsgView *view);
static void set_branding (ModestGtkhtmlMsgView *view, const gchar *brand_name, const GdkPixbuf *brand_icon);
static gboolean has_blocked_external_images (ModestGtkhtmlMsgView *view);
+static void set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg);
/* list properties */
enum {
#ifdef MODEST_TOOLKIT_HILDON2
GtkWidget *priority_box;
GtkWidget *priority_icon;
+ GtkWidget *calendar_box;
+ GtkWidget *calendar_icon;
#endif
+ GtkWidget *calendar_actions_box;
+ GtkWidget *calendar_actions_container;
/* internal adjustments for set_scroll_adjustments */
GtkAdjustment *hadj;
/* link click management */
gchar *last_url;
+
+ gboolean has_blocked_bs_images;
};
#define MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(obj);
+ priv->has_blocked_bs_images = FALSE;
+
priv->idle_changes_count = 0;
priv->idle_readjust_scroll_id = 0;
priv->idle_resize_children_id = 0;
gtk_widget_hide_all (priv->priority_box);
}
+ priv->calendar_actions_box = NULL;
+ priv->calendar_icon = gtk_image_new ();
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->calendar_icon), MODEST_HEADER_ICON_CALENDAR, GTK_ICON_SIZE_MENU);
+ gtk_misc_set_alignment (GTK_MISC (priv->calendar_icon), 0.0, 0.5);
+ if (priv->calendar_icon) {
+ priv->calendar_box = (GtkWidget *)
+ modest_mail_header_view_add_custom_header (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view),
+ _("mail_fi_invitation"),
+ priv->calendar_icon,
+ FALSE, FALSE);
+
+ gtk_widget_hide_all (priv->calendar_box);
+ }
#endif
if (priv->attachments_view) {
#ifndef MODEST_TOOLKIT_HILDON2
g_free (att_label);
}
+ priv->calendar_actions_container = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->headers_box), priv->calendar_actions_container, FALSE, FALSE, 0);
+ gtk_widget_hide (priv->calendar_actions_container);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
+
#ifndef MODEST_TOOLKIT_HILDON2
separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX(priv->headers_box), separator, FALSE, FALSE, 0);
/* 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);
+ priv->has_blocked_bs_images = FALSE;
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);
{
ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- return (modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)) &&
+ return ((modest_mime_part_view_has_external_images (MODEST_MIME_PART_VIEW (priv->body_view)) ||
+ (priv->has_blocked_bs_images)) &&
!modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)));
}
g_signal_emit_by_name (G_OBJECT (msg_view), "limit-error");
}
+static gboolean
+part_cids_equal (const gchar *part_cid1,
+ const gchar *part_cid2)
+{
+ if (g_strcmp0 (part_cid1, part_cid2) == 0)
+ return TRUE;
+
+ if (part_cid2 && part_cid2[0] == '<') {
+ const gchar *end;
+ end = g_strrstr_len (part_cid2, -1, ">");
+
+ if (end && strncmp (part_cid2 + 1, part_cid1, end - part_cid2 - 1) == 0)
+ return TRUE;
+ }
+ return FALSE;
+}
static TnyMimePart *
find_cid_image (TnyMsg *msg, const gchar *cid)
*/
if (!part_cid)
part_cid = tny_mime_part_get_content_location (part);
-
- if (part_cid && strcmp (cid, part_cid) == 0)
+
+ if (part_cids_equal (cid, part_cid))
break;
if (tny_mime_part_content_type_is (part, "multipart/related")) {
while (!tny_iterator_is_done (related_iter)) {
related_part = TNY_MIME_PART (tny_iterator_get_current (related_iter));
part_cid = tny_mime_part_get_content_id (related_part);
- if (part_cid && strcmp (cid, part_cid) == 0) {
+
+ if (part_cids_equal (cid, part_cid))
break;
- }
+
g_object_unref (related_part);
related_part = NULL;
tny_iterator_next (related_iter);
return part;
}
+static void
+fetch_url_decode_to_stream_cb (TnyMimePart *self, gboolean cancelled, TnyStream *stream, GError *err, gpointer user_data)
+{
+ tny_stream_close (stream);
+}
static gboolean
on_fetch_url (GtkWidget *widget, const gchar *uri,
} else {
return FALSE;
}
+ } else if (TNY_IS_CAMEL_BS_MIME_PART (part) &&
+ !tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (part))){
+ if (!modest_mime_part_view_get_view_images (MODEST_MIME_PART_VIEW (priv->body_view)) ||
+ !tny_device_is_online (modest_runtime_get_device ())) {
+ priv->has_blocked_bs_images = TRUE;
+ tny_stream_close (stream);
+ return TRUE;
+ }
}
- tny_mime_part_decode_to_stream ((TnyMimePart*)part, stream, NULL);
- tny_stream_close (stream);
+ tny_mime_part_decode_to_stream_async ((TnyMimePart*)part, stream, fetch_url_decode_to_stream_cb, NULL, NULL);
g_object_unref (G_OBJECT(part));
return TRUE;
}
g_return_if_fail (self);
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+ priv->has_blocked_bs_images = FALSE;
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);
gtk_widget_hide_all (priv->attachments_box);
#ifdef MODEST_TOOKIT_HILDON2
gtk_widget_hide_all (priv->priority_box);
+ gtk_widget_hide_all (priv->calendar_box);
#endif
+ gtk_widget_hide (priv->calendar_actions_container);
+ gtk_widget_hide_all (priv->calendar_actions_container);
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
/* Refresh priority */
set_priority (self, tny_header_get_flags (header));
+ set_calendar (self, header, msg);
gtk_widget_show (priv->body_view);
#ifdef MODEST_TOOLKIT_HILDON2
gtk_widget_set_no_show_all (priv->priority_box, TRUE);
+ gtk_widget_set_no_show_all (priv->calendar_box, TRUE);
#endif
+ gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
gtk_widget_set_no_show_all (priv->attachments_box, TRUE);
gtk_widget_show_all (priv->mail_header_view);
gtk_widget_set_no_show_all (priv->attachments_box, FALSE);
#ifdef MODEST_TOOLKIT_HILDON2
gtk_widget_set_no_show_all (priv->priority_box, FALSE);
+ gtk_widget_set_no_show_all (priv->calendar_box, FALSE);
#endif
+ gtk_widget_set_no_show_all (priv->calendar_actions_container, FALSE);
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
}
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self);
+ priv->has_blocked_bs_images = FALSE;
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);
gtk_widget_hide_all (priv->attachments_box);
#ifdef MODEST_TOOLKIT_HILDON2
gtk_widget_hide_all (priv->priority_box);
+ gtk_widget_hide_all (priv->calendar_box);
#endif
+ gtk_widget_hide (priv->calendar_actions_container);
+ gtk_widget_hide_all (priv->calendar_actions_container);
gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
priv->idle_changes_count = 0;
{
return has_blocked_external_images (MODEST_GTKHTML_MSG_VIEW (self));
}
+
+static void
+set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg)
+{
+ ModestGtkhtmlMsgViewPrivate *priv;
+ TnyMimePart *calendar_part;
+
+ g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
+ priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
+
+ gtk_widget_hide (priv->calendar_actions_container);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ if (priv->calendar_actions_box) {
+ gtk_widget_destroy (priv->calendar_actions_box);
+ priv->calendar_actions_box = NULL;
+ }
+
+ calendar_part = modest_tny_msg_find_calendar (TNY_MSG (msg));
+
+ if (calendar_part) {
+ gboolean retval = FALSE;
+ priv->calendar_actions_box = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->calendar_actions_container), priv->calendar_actions_box, FALSE, FALSE, 0);
+ g_signal_emit_by_name (G_OBJECT (self), "handle-calendar", calendar_part, priv->calendar_actions_box, &retval);
+ if (retval) {
+ gtk_widget_show (priv->calendar_actions_container);
+ gtk_widget_show_all (priv->calendar_actions_container);
+ gtk_widget_show (priv->calendar_actions_box);
+ gtk_widget_show_all (priv->calendar_actions_box);
+ } else {
+ gtk_widget_hide (priv->calendar_actions_container);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ gtk_widget_hide (priv->calendar_actions_box);
+ gtk_widget_hide_all (priv->calendar_actions_box);
+ }
+ gtk_widget_show_all (priv->calendar_box);
+ g_object_unref (calendar_part);
+ } else {
+ gtk_widget_hide_all (priv->calendar_box);
+ gtk_widget_hide (priv->calendar_actions_container);
+ gtk_widget_hide_all (priv->calendar_actions_container);
+ if (priv->calendar_actions_box)
+ gtk_widget_hide (priv->calendar_actions_box);
+ }
+}
projects / modest / blobdiff