X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-gtkhtml-msg-view.c;h=45321191250871f7437a90a029a848efddeba09c;hp=f615e2cbb2a0d0ef9bc86c602e15ad1ea578fe28;hb=a27cf1796b900bc0fbf80dfdc504d8346bd59cf3;hpb=2c22dd740c0e12453b08308517c181cfcd3c716e diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c index f615e2c..4532119 100644 --- a/src/widgets/modest-gtkhtml-msg-view.c +++ b/src/widgets/modest-gtkhtml-msg-view.c @@ -47,6 +47,11 @@ #include #include +/* FIXNE: we should have no maemo-deps in widgets/ */ +#ifdef MODEST_PLATFORM_MAEMO +#include "maemo/modest-hildon-includes.h" +#endif /*MODEST_PLATFORM_MAEMO*/ + /* 'private'/'protected' functions */ static void modest_gtkhtml_msg_view_class_init (ModestGtkhtmlMsgViewClass *klass); @@ -93,6 +98,13 @@ static void disconnect_vadjustment (ModestGtkhtmlMsgView *obj); static void disconnect_hadjustment (ModestGtkhtmlMsgView *obj); static gboolean idle_readjust_scroll (ModestGtkhtmlMsgView *obj); +/* vertical panning implementation */ +#ifdef MAEMO_CHANGES +static gboolean motion_notify_event (GtkWidget *widget, + GdkEventMotion *event, + gpointer userdata); +#endif + /* GtkContainer methods */ static void forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer userdata); @@ -143,8 +155,8 @@ static void modest_gtkhtml_msg_view_set_shadow_type (ModestMsgView *self, GtkSha static GtkShadowType modest_gtkhtml_msg_view_get_shadow_type (ModestMsgView *self); static TnyHeaderFlags modest_gtkhtml_msg_view_get_priority (ModestMsgView *self); static void modest_gtkhtml_msg_view_set_priority (ModestMsgView *self, TnyHeaderFlags flags); -static GList *modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView *self); -static GList *modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self); +static TnyList *modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView *self); +static TnyList *modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self); static void modest_gtkhtml_msg_view_grab_focus (ModestMsgView *self); static void modest_gtkhtml_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment); static GtkAdjustment *modest_gtkhtml_msg_view_get_vadjustment_default (ModestMsgView *self); @@ -155,8 +167,8 @@ static void modest_gtkhtml_msg_view_set_shadow_type_default (ModestMsgView *self static GtkShadowType modest_gtkhtml_msg_view_get_shadow_type_default (ModestMsgView *self); static TnyHeaderFlags modest_gtkhtml_msg_view_get_priority_default (ModestMsgView *self); static void modest_gtkhtml_msg_view_set_priority_default (ModestMsgView *self, TnyHeaderFlags flags); -static GList *modest_gtkhtml_msg_view_get_selected_attachments_default (ModestMsgView *self); -static GList *modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self); +static TnyList *modest_gtkhtml_msg_view_get_selected_attachments_default (ModestMsgView *self); +static TnyList *modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self); static void modest_gtkhtml_msg_view_grab_focus_default (ModestMsgView *self); static void modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *view, TnyMimePart *attachment); @@ -176,8 +188,8 @@ static void set_shadow_type (ModestGtkhtmlMsgView *self, GtkShadowType type); static GtkShadowType get_shadow_type (ModestGtkhtmlMsgView *self); static TnyHeaderFlags get_priority (ModestGtkhtmlMsgView *self); static void set_priority (ModestGtkhtmlMsgView *self, TnyHeaderFlags flags); -static GList *get_selected_attachments (ModestGtkhtmlMsgView *self); -static GList *get_attachments (ModestGtkhtmlMsgView *self); +static TnyList *get_selected_attachments (ModestGtkhtmlMsgView *self); +static TnyList *get_attachments (ModestGtkhtmlMsgView *self); static void grab_focus (ModestGtkhtmlMsgView *self); static void remove_attachment (ModestGtkhtmlMsgView *view, TnyMimePart *attachment); @@ -1038,6 +1050,10 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj) G_CALLBACK(on_fetch_url), obj); g_signal_connect (G_OBJECT(priv->body_view), "link_hover", G_CALLBACK(on_link_hover), obj); +#ifdef MAEMO_CHANGES + g_signal_connect (G_OBJECT(priv->body_view), "motion-notify-event", + G_CALLBACK (motion_notify_event), obj); +#endif g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated", G_CALLBACK (on_recpt_activated), obj); @@ -1121,6 +1137,35 @@ modest_gtkhtml_msg_view_destroy (GtkObject *obj) /* INTERNAL METHODS */ +#ifdef MAEMO_CHANGES +static gboolean +motion_notify_event (GtkWidget *widget, + GdkEventMotion *event, + gpointer userdata) +{ + ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata); + + /* Use panning information in gtkhtml widget to support also vertical panning */ + + if (GTK_HTML (widget)->panning) { + gint y, dy; + gdouble value; + + gdk_window_get_pointer (GTK_LAYOUT (widget)->bin_window, NULL, &y, NULL); + dy = y - GTK_HTML (widget)->lasty; + value = priv->vadj->value - (gdouble) dy; + + if (value < priv->vadj->lower) + value = priv->vadj->lower; + else if (value > priv->vadj->upper - priv->vadj->page_size) + value = priv->vadj->upper - priv->vadj->page_size; + gtk_adjustment_set_value (priv->vadj, value); + + } + return FALSE; +} +#endif + static GtkAdjustment * get_vadjustment (ModestGtkhtmlMsgView *self) { @@ -1322,6 +1367,13 @@ find_cid_image (TnyMsg *msg, const gchar *cid) part = TNY_MIME_PART(tny_iterator_get_current(iter)); part_cid = tny_mime_part_get_content_id (part); + /* if there is no content id, try the content location; + * this is what Outlook seems to use when it converts + * it's internal richtext to html + */ + if (!part_cid) + part_cid = tny_mime_part_get_content_location (part); + if (part_cid && strcmp (cid, part_cid) == 0) break; @@ -1371,26 +1423,31 @@ on_fetch_url (GtkWidget *widget, const gchar *uri, TnyStream *stream, ModestGtkhtmlMsgView *self) { ModestGtkhtmlMsgViewPrivate *priv; + const gchar* my_uri; + TnyMimePart *part = NULL; + priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self); - gboolean result = FALSE; + + /* + * we search for either something starting with cid:, or something + * with no prefix at all; this latter case occurs when sending mails + * with MS Outlook in rich-text mode, and 'attach-as-object + */ + if (g_str_has_prefix (uri, "cid:")) + my_uri = uri + 4; /* +4 ==> skip "cid:" */ + else + my_uri = uri; - if (g_str_has_prefix (uri, "cid:")) { - /* +4 ==> skip "cid:" */ - TnyMimePart *part = find_cid_image (priv->msg, uri + 4); - if (!part) { - g_printerr ("modest: '%s' not found\n", uri + 4); - result = FALSE; - } else { - tny_mime_part_decode_to_stream ((TnyMimePart*)part, - stream); - g_object_unref (G_OBJECT(part)); - result = TRUE; - } - } else { - return TRUE; + /* now try to find the embedded image */ + part = find_cid_image (priv->msg, my_uri); + if (!part) { + g_printerr ("modest: %s: '%s' not found\n", __FUNCTION__, my_uri); + return FALSE; } - return result; + tny_mime_part_decode_to_stream ((TnyMimePart*)part, stream, NULL); + g_object_unref (G_OBJECT(part)); + return TRUE; } static void @@ -1406,6 +1463,12 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg) priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(self); gtk_widget_set_no_show_all (priv->mail_header_view, FALSE); + html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll)); + html_vadj->upper = 0; + html_vadj->page_size = 0; + g_signal_emit_by_name (G_OBJECT (html_vadj), "changed"); + + if (msg != priv->msg) { if (priv->msg) g_object_unref (G_OBJECT(priv->msg)); @@ -1459,8 +1522,6 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg) if (priv->vadj != NULL) priv->vadj->value = 0.0; - html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll)); - g_signal_emit_by_name (G_OBJECT (html_vadj), "changed"); /* This is a hack to force reallocation of scroll after drawing all the stuff. This @@ -1612,7 +1673,7 @@ search_next (ModestGtkhtmlMsgView *self) return result; } -static GList * +static TnyList * get_selected_attachments (ModestGtkhtmlMsgView *self) { ModestGtkhtmlMsgViewPrivate *priv; @@ -1624,7 +1685,7 @@ get_selected_attachments (ModestGtkhtmlMsgView *self) } -static GList * +static TnyList * get_attachments (ModestGtkhtmlMsgView *self) { ModestGtkhtmlMsgViewPrivate *priv; @@ -1668,12 +1729,12 @@ tny_msg_view_init (gpointer g, gpointer iface_data) { 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; } @@ -1765,9 +1826,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data) { 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; } @@ -2049,25 +2110,25 @@ modest_gtkhtml_msg_view_get_priority_default (ModestMsgView *self) return get_priority (MODEST_GTKHTML_MSG_VIEW (self)); } -static GList* +static TnyList* modest_gtkhtml_msg_view_get_selected_attachments (ModestMsgView *self) { return MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->get_selected_attachments_func (self); } -static GList* +static TnyList* modest_gtkhtml_msg_view_get_selected_attachments_default (ModestMsgView *self) { return get_selected_attachments (MODEST_GTKHTML_MSG_VIEW (self)); } -static GList* +static TnyList* modest_gtkhtml_msg_view_get_attachments (ModestMsgView *self) { return MODEST_GTKHTML_MSG_VIEW_GET_CLASS (self)->get_attachments_func (self); } -static GList* +static TnyList* modest_gtkhtml_msg_view_get_attachments_default (ModestMsgView *self) { return get_attachments (MODEST_GTKHTML_MSG_VIEW (self)); @@ -2096,4 +2157,3 @@ modest_gtkhtml_msg_view_remove_attachment_default (ModestMsgView *self, TnyMimeP { remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment); } -