From: Dirk-Jan C. Binnema Date: Mon, 22 May 2006 14:41:17 +0000 (+0000) Subject: * modest-tny-stream-gtkhtml.[ch]: X-Git-Tag: git_migration_finished~4747 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=2f9b57f4cab8d61c10113d1e22974719bbf33745 * modest-tny-stream-gtkhtml.[ch]: - use GtkHTMLStream as the wrapped type, not GTKHtml. Simplifies things * modest-tny-msg-view.c: - implemented embedded images in HTML mails. Now we can read spam effectively :-) (external images are not supported, as they are a privacy risk, but maybe later, when user asks for it) pmo-trunk-r103 --- diff --git a/src/modest-tny-msg-view.c b/src/modest-tny-msg-view.c index 2741c5c..9bb4944 100644 --- a/src/modest-tny-msg-view.c +++ b/src/modest-tny-msg-view.c @@ -19,6 +19,13 @@ static void modest_tny_msg_view_finalize (GObject *obj); static GSList* get_url_matches (GString *txt); static gboolean fill_gtkhtml_with_txt (GtkHTML* gtkhtml, const gchar* txt); +static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri, + ModestTnyMsgView *msg_view); +static gboolean on_url_requested (GtkWidget *widget, const gchar *uri, + GtkHTMLStream *stream, + ModestTnyMsgView *msg_view); + + /* * we need these regexps to find URLs in plain text e-mails */ @@ -26,7 +33,8 @@ typedef struct _UrlMatchPattern UrlMatchPattern; struct _UrlMatchPattern { gchar *regex; regex_t *preg; - gchar *prefix; + gchar *prefix; + }; #define MAIL_VIEWER_URL_MATCH_PATTERNS {\ { "(file|http|ftp|https)://[-A-Za-z0-9_$.+!*(),;:@%&=?/~#]+[-A-Za-z0-9_$%&=?/~#]",\ @@ -54,6 +62,7 @@ enum { typedef struct _ModestTnyMsgViewPrivate ModestTnyMsgViewPrivate; struct _ModestTnyMsgViewPrivate { GtkWidget *gtkhtml; + TnyMsgIface *msg; }; #define MODEST_TNY_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_MSG_VIEW, \ @@ -106,12 +115,20 @@ modest_tny_msg_view_init (ModestTnyMsgView *obj) priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(obj); + priv->msg = NULL; + priv->gtkhtml = gtk_html_new(); 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); gtk_html_set_blocking (GTK_HTML(priv->gtkhtml), FALSE); gtk_html_set_images_blocking (GTK_HTML(priv->gtkhtml), FALSE); + + g_signal_connect (G_OBJECT(priv->gtkhtml), "link_clicked", + G_CALLBACK(on_link_clicked), obj); + + g_signal_connect (G_OBJECT(priv->gtkhtml), "url_requested", + G_CALLBACK(on_url_requested), obj); } @@ -151,6 +168,70 @@ modest_tny_msg_view_new (TnyMsgIface *msg) +static gboolean +on_link_clicked (GtkWidget *widget, const gchar *uri, + ModestTnyMsgView *msg_view) +{ + g_message ("link clicked: %s", uri); /* FIXME */ +} + + + +static TnyMsgMimePartIface * +find_cid_image (TnyMsgIface *msg, const gchar *cid) +{ + TnyMsgMimePartIface *part = NULL; + GList *parts; + + g_return_val_if_fail (msg, NULL); + g_return_val_if_fail (cid, NULL); + + parts = (GList*) tny_msg_iface_get_parts (msg); + while (parts && !part) { + const gchar *part_cid; + part = TNY_MSG_MIME_PART_IFACE(parts->data); + part_cid = tny_msg_mime_part_iface_get_content_id (part); + if (part_cid && strcmp (cid, part_cid) == 0) + return part; /* we found it! */ + + part = NULL; + parts = parts->next; + } + + return part; +} + + +static gboolean +on_url_requested (GtkWidget *widget, const gchar *uri, + GtkHTMLStream *stream, + ModestTnyMsgView *msg_view) +{ + + ModestTnyMsgViewPrivate *priv; + priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE (msg_view); + + g_message ("url requested: %s", uri); + + if (g_str_has_prefix (uri, "cid:")) { + /* +4 ==> skip "cid:" */ + + TnyMsgMimePartIface *part = find_cid_image (priv->msg, uri + 4); + if (!part) { + g_message ("%s not found", uri + 4); + 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; +} + + + typedef struct { guint offset; @@ -373,14 +454,15 @@ set_html_message (ModestTnyMsgView *self, TnyMsgMimePartIface *tny_body) { TnyStreamIface *gtkhtml_stream; ModestTnyMsgViewPrivate *priv; - + g_return_val_if_fail (self, FALSE); g_return_val_if_fail (tny_body, FALSE); priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(self); gtkhtml_stream = - TNY_STREAM_IFACE(modest_tny_stream_gtkhtml_new(GTK_HTML(priv->gtkhtml))); + TNY_STREAM_IFACE(modest_tny_stream_gtkhtml_new + (gtk_html_begin(GTK_HTML(priv->gtkhtml)))); tny_stream_iface_reset (gtkhtml_stream); tny_msg_mime_part_iface_decode_to_stream (tny_body, gtkhtml_stream); @@ -407,7 +489,7 @@ set_text_message (ModestTnyMsgView *self, TnyMsgMimePartIface *tny_body) g_return_val_if_fail (tny_body, FALSE); priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(self); - + buf = gtk_text_buffer_new (NULL); txt_stream = TNY_STREAM_IFACE(tny_text_buffer_stream_new (buf)); @@ -439,6 +521,8 @@ modest_tny_msg_view_set_message (ModestTnyMsgView *self, TnyMsgIface *msg) priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(self); + priv->msg = msg; + fill_gtkhtml_with_txt (GTK_HTML(priv->gtkhtml), ""); if (!msg) diff --git a/src/modest-tny-stream-gtkhtml.c b/src/modest-tny-stream-gtkhtml.c index a771083..b9d8c69 100644 --- a/src/modest-tny-stream-gtkhtml.c +++ b/src/modest-tny-stream-gtkhtml.c @@ -22,7 +22,6 @@ enum { typedef struct _ModestTnyStreamGtkhtmlPrivate ModestTnyStreamGtkhtmlPrivate; struct _ModestTnyStreamGtkhtmlPrivate { - GtkHTML *gtkhtml; GtkHTMLStream *stream; }; #define MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -85,8 +84,7 @@ modest_tny_stream_gtkhtml_init (ModestTnyStreamGtkhtml *obj) { ModestTnyStreamGtkhtmlPrivate *priv; priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(obj); - - priv->gtkhtml = NULL; + priv->stream = NULL; } @@ -96,22 +94,21 @@ modest_tny_stream_gtkhtml_finalize (GObject *obj) ModestTnyStreamGtkhtmlPrivate *priv; priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(obj); - priv->gtkhtml = NULL; priv->stream = NULL; } GObject* -modest_tny_stream_gtkhtml_new (GtkHTML *gtkhtml) +modest_tny_stream_gtkhtml_new (GtkHTMLStream *stream) { GObject *obj; ModestTnyStreamGtkhtmlPrivate *priv; - - g_return_val_if_fail (gtkhtml, NULL); obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_STREAM_GTKHTML, NULL)); priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(obj); - priv->gtkhtml = gtkhtml; + g_return_val_if_fail (stream, NULL); + + priv->stream = stream; return obj; } @@ -135,10 +132,10 @@ gtkhtml_write (TnyStreamIface *self, const char *buffer, size_t n) g_return_val_if_fail (self, 0); priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(self); - if (!priv->stream) - priv->stream = gtk_html_begin (GTK_HTML(priv->gtkhtml)); - - gtk_html_stream_write (priv->stream, buffer, n); + if (!priv->stream) + g_warning ("cannot write to closed stream"); + else + gtk_html_stream_write (priv->stream, buffer, n); return n; /* hmmm */ } @@ -147,11 +144,6 @@ gtkhtml_write (TnyStreamIface *self, const char *buffer, size_t n) static gint gtkhtml_flush (TnyStreamIface *self) { - ModestTnyStreamGtkhtmlPrivate *priv; - g_return_val_if_fail (self, 0); - priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(self); - - gtk_html_flush (GTK_HTML(priv->gtkhtml)); return 0; } @@ -173,7 +165,6 @@ gtkhtml_close (TnyStreamIface *self) static gboolean gtkhtml_eos (TnyStreamIface *self) { - g_warning (__FUNCTION__); return TRUE; } @@ -182,15 +173,6 @@ gtkhtml_eos (TnyStreamIface *self) static gint gtkhtml_reset (TnyStreamIface *self) { - ModestTnyStreamGtkhtmlPrivate *priv; - g_return_val_if_fail (self, 0); - priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(self); - - if (priv->stream) { - gtk_html_end (priv->gtkhtml, priv->stream, GTK_HTML_STREAM_OK); - priv->stream = NULL; - } - return 0; } @@ -198,7 +180,6 @@ gtkhtml_reset (TnyStreamIface *self) static ssize_t gtkhtml_write_to_stream (TnyStreamIface *self, TnyStreamIface *output) { - g_warning (__FUNCTION__); return 0; } diff --git a/src/modest-tny-stream-gtkhtml.h b/src/modest-tny-stream-gtkhtml.h index 02241ff..3f9d6e8 100644 --- a/src/modest-tny-stream-gtkhtml.h +++ b/src/modest-tny-stream-gtkhtml.h @@ -13,7 +13,7 @@ G_BEGIN_DECLS /* convenience macros */ #define MODEST_TYPE_TNY_STREAM_GTKHTML (modest_tny_stream_gtkhtml_get_type()) #define MODEST_TNY_STREAM_GTKHTML(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_TNY_STREAM_GTKHTML,ModestTnyStreamGtkhtml)) -#define MODEST_TNY_STREAM_GTKHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_STREAM_GTKHTML,GObject)) +#define MODEST_TNY_STREAM_GTKHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_TNY_STREAM_GTKHTML,ModestTnyStreamGtkhtmlClass)) #define MODEST_IS_TNY_STREAM_GTKHTML(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_TNY_STREAM_GTKHTML)) #define MODEST_IS_TNY_STREAM_GTKHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_TNY_STREAM_GTKHTML)) #define MODEST_TNY_STREAM_GTKHTML_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_TNY_STREAM_GTKHTML,ModestTnyStreamGtkhtmlClass)) @@ -27,14 +27,11 @@ struct _ModestTnyStreamGtkhtml { struct _ModestTnyStreamGtkhtmlClass { GObjectClass parent_class; - /* insert signal callback declarations, eg. */ - /* void (* my_event) (ModestTnyStreamGtkhtml* obj); */ }; -/* member functions */ -GType modest_tny_stream_gtkhtml_get_type (void) G_GNUC_CONST; +GType modest_tny_stream_gtkhtml_get_type (void) G_GNUC_CONST; -GObject* modest_tny_stream_gtkhtml_new (GtkHTML* gtkhtml); +GObject* modest_tny_stream_gtkhtml_new (GtkHTMLStream* stream); G_END_DECLS