#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>
static GSList* get_url_matches (GString *txt);
-static gboolean fill_gtkhtml_with_txt (GtkHTML* gtkhtml, const gchar* txt);
+static gboolean fill_gtkhtml_with_txt (GtkHTML* gtkhtml, const gchar* txt, TnyMsgIface *msg);
static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri,
ModestTnyMsgView *msg_view);
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! */
} url_match_t;
+static gchar *
+attachments_as_html(TnyMsgIface *msg)
+{
+ gboolean attachments_found = FALSE;
+ GString *appendix;
+ const GList *attl;
+ const gchar *content_type, *filename;
+ if (!msg)
+ return g_malloc0(1);
+ appendix = g_string_new("<HTML><BODY>\n<h5>Attachments:</h5>\n");
+ attl = tny_msg_iface_get_parts(msg);
+ while (attl) {
+ filename = "";
+ content_type = tny_msg_mime_part_iface_get_content_type(
+ TNY_MSG_MIME_PART_IFACE(attl->data));
+ g_return_if_fail(content_type);
+ if (strcmp (content_type, "image/jpeg") == 0 || strcmp (content_type, "image/gif") == 0) {
+ filename = tny_msg_mime_part_iface_get_filename(
+ TNY_MSG_MIME_PART_IFACE(attl->data));
+ if (!filename)
+ filename = "unknown";
+ else
+ attachments_found = TRUE;
+ g_string_append_printf(appendix, "<A href=\"attachment:%s\">%s</A>: %s<BR>\n", filename, filename, content_type);
+ }
+ attl = attl->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 (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(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(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 (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;
/* 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 (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"));
+ _("Unsupported message type"), msg);
}
projects / modest / blobdiff