#include "modest-tny-msg-view.h"
#include "modest-tny-stream-gtkhtml.h"
+#include "modest-tny-msg-actions.h"
+
#include <tny-text-buffer-stream.h>
#include <string.h>
#include <regex.h>
#include <ctype.h>
#include <glib/gi18n.h>
+#include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-stream.h>
/* 'private'/'protected' functions */
static void modest_tny_msg_view_class_init (ModestTnyMsgViewClass *klass);
static GSList* get_url_matches (GString *txt);
-static gboolean fill_gtkhtml_with_txt (GtkHTML* gtkhtml, const gchar* txt);
+static gboolean fill_gtkhtml_with_txt (ModestTnyMsgView *self, GtkHTML* gtkhtml, const gchar* txt, TnyMsgIface *msg);
static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri,
ModestTnyMsgView *msg_view);
struct _ModestTnyMsgViewPrivate {
GtkWidget *gtkhtml;
TnyMsgIface *msg;
+ gboolean show_attachments;
};
#define MODEST_TNY_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_TNY_MSG_VIEW, \
priv->msg = NULL;
priv->gtkhtml = gtk_html_new();
+
+ /* TODO: -> conf-mgr */
+ priv->show_attachments = FALSE;
+
gtk_html_set_editable (GTK_HTML(priv->gtkhtml), FALSE);
gtk_html_allow_selection (GTK_HTML(priv->gtkhtml), TRUE);
gtk_html_set_caret_mode (GTK_HTML(priv->gtkhtml), FALSE);
static void
modest_tny_msg_view_finalize (GObject *obj)
{
- ModestTnyMsgViewPrivate *priv;
- priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(obj);
-
- if (priv->gtkhtml)
- g_object_unref (G_OBJECT(priv->gtkhtml));
+
}
GtkWidget*
on_link_clicked (GtkWidget *widget, const gchar *uri,
ModestTnyMsgView *msg_view)
{
+ ModestTnyMsgViewPrivate *priv;
+
+
+ if (g_str_has_prefix(uri, "attachment:")) {
+ priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(msg_view);
+ priv->show_attachments = !priv->show_attachments;
+ modest_tny_msg_view_set_message(msg_view, priv->msg);
+ return TRUE;
+ }
g_message ("link clicked: %s", uri); /* FIXME */
+ return FALSE;
+
}
const gchar *part_cid;
part = TNY_MSG_MIME_PART_IFACE(parts->data);
part_cid = tny_msg_mime_part_iface_get_content_id (part);
+ printf("CMP:%s:%s\n", cid, part_cid);
if (part_cid && strcmp (cid, part_cid) == 0)
return part; /* we found it! */
return part;
}
+static TnyMsgMimePartIface *
+find_attachment_by_filename (TnyMsgIface *msg, const gchar *fn)
+{
+ TnyMsgMimePartIface *part = NULL;
+ GList *parts;
+
+ g_return_val_if_fail (msg, NULL);
+ g_return_val_if_fail (fn, NULL);
+
+ parts = (GList*) tny_msg_iface_get_parts (msg);
+ while (parts && !part) {
+ const gchar *part_fn;
+ part = TNY_MSG_MIME_PART_IFACE(parts->data);
+ part_fn = tny_msg_mime_part_iface_get_filename (part);
+ if (part_fn && strcmp (fn, part_fn) == 0)
+ return part; /* we found it! */
+
+ part = NULL;
+ parts = parts->next;
+ }
+
+ return part;
+}
static gboolean
on_url_requested (GtkWidget *widget, const gchar *uri,
tny_msg_mime_part_iface_decode_to_stream (part,tny_stream);
gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
}
+ } else if (g_str_has_prefix (uri, "Attachment:")) {
+ /* +11 ==> skip... */
+
+ TnyMsgMimePartIface *part = find_attachment_by_filename (priv->msg, uri + 11);
+ if (!part) {
+ g_message ("%s not found", uri + 11);
+ gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
+ } else {
+ TnyStreamIface *tny_stream =
+ TNY_STREAM_IFACE(modest_tny_stream_gtkhtml_new(stream));
+ tny_msg_mime_part_iface_decode_to_stream (part,tny_stream);
+ gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
+ }
}
return TRUE;
}
} url_match_t;
+static gchar *
+attachments_as_html(ModestTnyMsgView *self, TnyMsgIface *msg)
+{
+ ModestTnyMsgViewPrivate *priv;
+ gboolean attachments_found = FALSE;
+ GString *appendix;
+ const GList *attachment_list, *attachment;
+ const gchar *content_type, *filename;
+
+ if (!msg)
+ return g_malloc0(1);
+
+ priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE (self);
+
+ /* CLEANUP: starting a new HTML may be unsupported */
+ appendix = g_string_new("<HTML><BODY>\n<hr><h5>Attachments:</h5>\n");
+
+ attachment_list = tny_msg_iface_get_parts(msg);
+ attachment = attachment_list;
+ while (attachment) {
+ filename = "";
+ content_type = tny_msg_mime_part_iface_get_content_type(
+ TNY_MSG_MIME_PART_IFACE(attachment->data));
+ g_return_val_if_fail(content_type, NULL);
+ if ( tny_msg_mime_part_iface_content_type_is(
+ TNY_MSG_MIME_PART_IFACE(attachment->data),
+ "image/jpeg")
+ || tny_msg_mime_part_iface_content_type_is(
+ TNY_MSG_MIME_PART_IFACE(attachment->data),
+ "image/gif")) {
+ filename = tny_msg_mime_part_iface_get_filename(
+ TNY_MSG_MIME_PART_IFACE(attachment->data));
+ if (!filename)
+ filename = "[unknown]";
+ else
+ attachments_found = TRUE;
+ if (priv->show_attachments) {
+ g_string_append_printf(appendix, "<IMG src=\"Attachment:%s\">\n<BR><A href=\"attachment:%s\">%s</A>\n", filename, filename, filename);
+ } else {
+ g_string_append_printf(appendix, "<A href=\"attachment:%s\">%s</A>: %s<BR>\n", filename, filename, content_type);
+ }
+ }
+ attachment = attachment->next;
+ }
+ g_string_append(appendix, "</BODY></HTML>");
+ if (!attachments_found)
+ g_string_assign(appendix, "");
+ return g_string_free(appendix, FALSE);
+}
+
static void
hyperlinkify_plain_text (GString *txt)
{
g_free (url);
g_free (repl);
-
+
+ g_free (cursor->data);
}
+
g_slist_free (match_list);
}
}
}
}
-
+
g_string_append (html, "</tt></body></html>");
hyperlinkify_plain_text (html);
}
static gboolean
-fill_gtkhtml_with_txt (GtkHTML* gtkhtml, const gchar* txt)
+fill_gtkhtml_with_txt (ModestTnyMsgView *self, GtkHTML* gtkhtml, const gchar* txt, TnyMsgIface *msg)
{
- gchar *html;
+ GString *html;
+ gchar *html_attachments;
g_return_val_if_fail (gtkhtml, FALSE);
g_return_val_if_fail (txt, FALSE);
- html = convert_to_html (txt);
- gtk_html_load_from_string (gtkhtml, html, strlen(html));
- g_free (html);
+ html = g_string_new(convert_to_html (txt));
+ html_attachments = attachments_as_html(self, msg);
+ g_string_append(html, html_attachments);
+
+ gtk_html_load_from_string (gtkhtml, html->str, html->len);
+ g_string_free (html, TRUE);
+ g_free(html_attachments);
return TRUE;
}
-static TnyMsgMimePartIface *
-find_body_part (TnyMsgIface *msg, const gchar *mime_type)
-{
- TnyMsgMimePartIface *part = NULL;
- GList *parts;
-
- g_return_val_if_fail (msg, NULL);
- g_return_val_if_fail (mime_type, NULL);
-
- parts = (GList*) tny_msg_iface_get_parts (msg);
- while (parts && !part) {
- part = TNY_MSG_MIME_PART_IFACE(parts->data);
- if (!tny_msg_mime_part_iface_content_type_is (part, mime_type))
- part = NULL;
- parts = parts->next;
- }
-
- return part;
-}
-
static gboolean
-set_html_message (ModestTnyMsgView *self, TnyMsgMimePartIface *tny_body)
+set_html_message (ModestTnyMsgView *self, TnyMsgMimePartIface *tny_body, TnyMsgIface *msg)
{
+ gchar *html_attachments;
TnyStreamIface *gtkhtml_stream;
ModestTnyMsgViewPrivate *priv;
tny_stream_iface_reset (gtkhtml_stream);
tny_msg_mime_part_iface_decode_to_stream (tny_body, gtkhtml_stream);
+ html_attachments = attachments_as_html(self, msg);
+ /* is this clean? */
+ gtkhtml_write(gtkhtml_stream, html_attachments, strlen(html_attachments));
tny_stream_iface_reset (gtkhtml_stream);
g_object_unref (G_OBJECT(gtkhtml_stream));
+ g_free (html_attachments);
return TRUE;
}
/* this is a hack --> we use the tny_text_buffer_stream to
* get the message text, then write to gtkhtml 'by hand' */
static gboolean
-set_text_message (ModestTnyMsgView *self, TnyMsgMimePartIface *tny_body)
+set_text_message (ModestTnyMsgView *self, TnyMsgMimePartIface *tny_body, TnyMsgIface *msg)
{
GtkTextBuffer *buf;
GtkTextIter begin, end;
gtk_text_buffer_get_bounds (buf, &begin, &end);
txt = gtk_text_buffer_get_text (buf, &begin, &end, FALSE);
- fill_gtkhtml_with_txt (GTK_HTML(priv->gtkhtml), txt);
-
+ fill_gtkhtml_with_txt (self, GTK_HTML(priv->gtkhtml), txt, msg);
+
g_object_unref (G_OBJECT(txt_stream));
g_object_unref (G_OBJECT(buf));
return TRUE;
}
-GtkTextBuffer *
+gchar *
modest_tny_msg_view_get_selected_text (ModestTnyMsgView *self)
{
ModestTnyMsgViewPrivate *priv;
GtkWidget *html;
int len;
GtkClipboard *clip;
- gchar *text;
- GtkTextBuffer *buf;
- g_return_if_fail (self);
+ g_return_val_if_fail (self, NULL);
priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(self);
html = priv->gtkhtml;
/* I'm sure there is a better way to check for selected text */
sel = gtk_html_get_selection_html(GTK_HTML(html), &len);
-
- if (sel == NULL)
+ if (!sel)
return NULL;
- clip = gtk_widget_get_clipboard(html, GDK_SELECTION_PRIMARY);
- text = gtk_clipboard_wait_for_text(clip);
- if (text == NULL)
- return NULL;
+ g_free(sel);
- buf = gtk_text_buffer_new(NULL);
- gtk_text_buffer_set_text(buf, text, -1);
- g_free(text);
- return buf;
+ clip = gtk_widget_get_clipboard(html, GDK_SELECTION_PRIMARY);
+ return gtk_clipboard_wait_for_text(clip);
}
void
priv->msg = msg;
- fill_gtkhtml_with_txt (GTK_HTML(priv->gtkhtml), "");
+ fill_gtkhtml_with_txt (self, GTK_HTML(priv->gtkhtml), "", msg);
if (!msg)
return;
- body = find_body_part (msg, "text/html");
+ body = modest_tny_msg_actions_find_body_part (msg, "text/html");
if (body) {
- set_html_message (self, body);
+ set_html_message (self, body, msg);
return;
}
- body = find_body_part (msg, "text/plain");
+ body = modest_tny_msg_actions_find_body_part (msg, "text/plain");
if (body) {
- set_text_message (self, body);
+ set_text_message (self, body, msg);
return;
}
/* hmmmmm */
- fill_gtkhtml_with_txt (GTK_HTML(priv->gtkhtml),
- _("Unsupported message type"));
+ fill_gtkhtml_with_txt (self, GTK_HTML(priv->gtkhtml),
+ _("Unsupported message type"), msg);
}
projects / modest / blobdiff