[evolution/webkit] Port 'Show animated images' option
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit] Port 'Show animated images' option
- Date: Fri, 9 Mar 2012 16:13:28 +0000 (UTC)
commit 9c0060f032bf4fea023172c3f278f8ac5e32a385
Author: Dan VrÃtil <dvratil redhat com>
Date: Fri Mar 9 17:13:14 2012 +0100
Port 'Show animated images' option
The property has been moved from EWebView (since WebKit does not support
such functionality) to EMFormatHTML. The image writer function will now
check if the image it is writing is an animated GIF and when the option
is disabled, it will extract the first frame from the animation, otherwise
it works like before
mail/em-format-html.c | 173 +++++++++++++++++++++++++++---
mail/em-format-html.h | 11 ++-
modules/mail/e-mail-config-format-html.c | 5 +
modules/mail/e-mail-config-web-view.c | 6 -
widgets/misc/e-web-view.c | 55 ----------
widgets/misc/e-web-view.h | 3 -
6 files changed, 175 insertions(+), 78 deletions(-)
---
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 373aeda..22b5cf0 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -83,6 +83,7 @@ struct _EMFormatHTMLPrivate {
guint only_local_photos : 1;
guint show_sender_photo : 1;
guint show_real_date : 1;
+ guint animate_images : 1;
};
static gpointer parent_class;
@@ -100,6 +101,7 @@ enum {
PROP_SHOW_SENDER_PHOTO,
PROP_SHOW_REAL_DATE,
PROP_TEXT_COLOR,
+ PROP_ANIMATE_IMAGES
};
#define EFM_MESSAGE_START_ANAME "evolution_message_start"
@@ -565,34 +567,82 @@ efh_write_image (EMFormat *emf,
GCancellable *cancellable)
{
gchar *content;
+ EMFormatHTML *efh;
CamelDataWrapper *dw;
GByteArray *ba;
if (g_cancellable_is_cancelled (cancellable))
return;
+ efh = (EMFormatHTML *) emf;
+
dw = camel_medium_get_content (CAMEL_MEDIUM (puri->part));
g_return_if_fail (dw);
ba = camel_data_wrapper_get_byte_array (dw);
- content = g_strndup ((gchar *) ba->data, ba->len);
if (info->mode == EM_FORMAT_WRITE_MODE_RAW) {
- CamelStream *stream_filter;
- CamelMimeFilter *filter;
- filter = camel_mime_filter_basic_new (CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
- stream_filter = camel_stream_filter_new (stream);
- camel_stream_filter_add ((CamelStreamFilter *) stream_filter, filter);
+ if (!efh->priv->animate_images) {
+
+ gchar *buff;
+ gsize len;
+ gchar *data;
+ GByteArray anim;
+
+ data = g_strndup ((gchar *) ba->data, (gsize) ba->len);
+ anim.data = g_base64_decode (data, (gsize *) &(anim.len));
+ g_free (data);
+
+ em_format_html_animation_extract_frame (&anim, &buff, &len);
+
+ camel_stream_write (stream, buff, len, cancellable, NULL);
- camel_stream_write_string (stream_filter, content, cancellable, NULL);
+ g_free (buff);
+ g_free (anim.data);
- g_object_unref (filter);
- g_object_unref (stream_filter);
+ } else {
+ CamelStream *stream_filter;
+ CamelMimeFilter *filter;
+
+ stream_filter = camel_stream_filter_new (stream);
+ filter = camel_mime_filter_basic_new (
+ CAMEL_MIME_FILTER_BASIC_BASE64_DEC);
+
+ camel_stream_write (
+ stream_filter,
+ (gchar *) ba->data, ba->len,
+ cancellable, NULL);
+ g_object_unref (stream_filter);
+ g_object_unref (filter);
+ }
} else {
+
gchar *buffer;
+ if (!efh->priv->animate_images) {
+
+ gchar *buff;
+ gsize len;
+ gchar *data;
+ GByteArray raw_data;
+
+ data = g_strndup ((gchar *) ba->data, ba->len);
+ raw_data.data = (guint8 *) g_base64_decode (
+ data, (gsize *) &(raw_data.len));
+ g_free (data);
+
+ em_format_html_animation_extract_frame (&raw_data, &buff, &len);
+
+ content = g_base64_encode ((guchar *) buff, len);
+ g_free (buff);
+ g_free (raw_data.data);
+
+ } else {
+ content = g_strndup ((gchar *) ba->data, ba->len);
+ }
+
/* The image is already base64-encrypted so we can directly
paste it to the output */
buffer = g_strdup_printf (
@@ -601,9 +651,8 @@ efh_write_image (EMFormat *emf,
camel_stream_write_string (stream, buffer, cancellable, NULL);
g_free (buffer);
+ g_free (content);
}
-
- g_free (content);
}
static void
@@ -1331,6 +1380,12 @@ efh_set_property (GObject *object,
EM_FORMAT_HTML_COLOR_TEXT,
g_value_get_boxed (value));
return;
+
+ case PROP_ANIMATE_IMAGES:
+ em_format_html_set_animate_images (
+ EM_FORMAT_HTML (object),
+ g_value_get_boolean (value));
+ return;
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1423,6 +1478,11 @@ efh_get_property (GObject *object,
&color);
g_value_set_boxed (value, &color);
return;
+ case PROP_ANIMATE_IMAGES:
+ g_value_set_boolean (
+ value, em_format_html_get_animate_images (
+ EM_FORMAT_HTML (object)));
+ return;
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1739,7 +1799,15 @@ efh_class_init (EMFormatHTMLClass *klass)
GDK_TYPE_COLOR,
G_PARAM_READWRITE));
-
+ g_object_class_install_property (
+ object_class,
+ PROP_ANIMATE_IMAGES,
+ g_param_spec_boolean (
+ "animate-images",
+ "Animate images",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
}
static void
@@ -1980,11 +2048,30 @@ em_format_html_set_show_real_date (EMFormatHTML *efh,
{
g_return_if_fail (EM_IS_FORMAT_HTML (efh));
- efh->priv->show_real_date = show_real_date;
+ efh->priv->show_real_date = show_real_date;
g_object_notify (G_OBJECT (efh), "show-real-date");
}
+gboolean
+em_format_html_get_animate_images (EMFormatHTML *efh)
+{
+ g_return_val_if_fail (EM_IS_FORMAT_HTML (efh), FALSE);
+
+ return efh->priv->animate_images;
+}
+
+void
+em_format_html_set_animate_images (EMFormatHTML *efh,
+ gboolean animate_images)
+{
+ g_return_if_fail (EM_IS_FORMAT_HTML (efh));
+
+ efh->priv->animate_images = animate_images;
+
+ g_object_notify (G_OBJECT (efh), "animate-images");
+}
+
CamelMimePart *
em_format_html_file_part (EMFormatHTML *efh,
const gchar *mime_type,
@@ -2822,3 +2909,63 @@ em_format_html_can_load_images (EMFormatHTML *efh)
((efh->priv->image_loading_policy == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES) &&
efh->priv->can_load_images));
}
+
+void
+em_format_html_animation_extract_frame (const GByteArray *anim,
+ gchar **frame,
+ gsize *len)
+{
+ GdkPixbufLoader *loader;
+ GdkPixbufAnimation *animation;
+ GdkPixbuf *frame_buf;
+
+ /* GIF89a (GIF image signature) */
+ const gchar GIF_HEADER[] = { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 };
+ const int GIF_HEADER_LEN = sizeof (GIF_HEADER);
+
+ /* NETSCAPE2.0 (extension describing animated GIF, starts on 0x310) */
+ const gchar GIF_APPEXT[] = { 0x4E, 0x45, 0x54, 0x53, 0x43, 0x41,
+ 0x50, 0x45, 0x32, 0x2E, 0x30 };
+ const int GIF_APPEXT_LEN = sizeof (GIF_APPEXT);
+
+ /* Check if the image is an animated GIF. We don't care about any
+ * other animated formats (APNG or MNG) as WebKit does not support them
+ * and displays only the first frame. */
+ if ((anim->len < 0x331)
+ || (memcmp (anim->data, GIF_HEADER, GIF_HEADER_LEN) != 0)
+ || (memcmp (&anim->data[0x310], GIF_APPEXT, GIF_APPEXT_LEN) != 0)) {
+
+ *frame = g_memdup (anim->data, anim->len);
+ *len = anim->len;
+ return;
+ }
+
+ loader = gdk_pixbuf_loader_new ();
+ gdk_pixbuf_loader_write (loader, (guchar *) anim->data, anim->len, NULL);
+ gdk_pixbuf_loader_close (loader, NULL);
+ animation = gdk_pixbuf_loader_get_animation (loader);
+ if (!animation) {
+
+ *frame = g_memdup (anim->data, anim->len);
+ *len = anim->len;
+ g_object_unref (loader);
+ return;
+ }
+
+ /* Extract first frame */
+ frame_buf = gdk_pixbuf_animation_get_static_image (animation);
+ if (!frame_buf) {
+ *frame = g_memdup (anim->data, anim->len);
+ *len = anim->len;
+ g_object_unref (loader);
+ g_object_unref (animation);
+ return;
+ }
+
+ /* Unforunatelly, GdkPixbuf cannot save to GIF, but WebKit does not
+ * have any trouble displaying PNG image despite the part having
+ * image/gif mime-type */
+ gdk_pixbuf_save_to_buffer (frame_buf, frame, len, "png", NULL, NULL);
+
+ g_object_unref (loader);
+}
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 008e488..c264c47 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -163,7 +163,11 @@ gboolean em_format_html_get_show_sender_photo
void em_format_html_set_show_sender_photo
(EMFormatHTML *efh,
gboolean show_sender_photo);
-
+gboolean em_format_html_get_animate_images
+ (EMFormatHTML *efh);
+void em_format_html_set_animate_images
+ (EMFormatHTML *efh,
+ gboolean animate_images);
void em_format_html_clone_sync (CamelFolder *folder,
const gchar *message_uid,
CamelMimeMessage *message,
@@ -209,6 +213,11 @@ void em_format_html_format_header (EMFormat *emf,
gboolean em_format_html_can_load_images (EMFormatHTML *efh);
+void em_format_html_animation_extract_frame
+ (const GByteArray *anim,
+ gchar **frame,
+ gsize *len);
+
G_END_DECLS
#endif /* EM_FORMAT_HTML_H */
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 6f0a1af..c823487 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -76,6 +76,11 @@ mail_config_format_html_constructed (GObject *object)
extensible, "show-real-date",
G_BINDING_SYNC_CREATE);
+ g_object_bind_property (
+ shell_settings, "mail-show-animated-images",
+ extensible, "animate-images",
+ G_BINDING_SYNC_CREATE);
+
/* Chain up to parent's constructed() method. */
G_OBJECT_CLASS (parent_class)->constructed (object);
}
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 80f3f65..813256e 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -151,12 +151,6 @@ mail_config_web_view_realize (GtkWidget *widget,
{
g_object_bind_property (
extension->shell_settings,
- "mail-show-animated-images",
- widget, "animate",
- G_BINDING_SYNC_CREATE);
-
- g_object_bind_property (
- extension->shell_settings,
"composer-inline-spelling",
widget, "inline-spelling",
G_BINDING_SYNC_CREATE);
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 0152a85..0deb880 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -73,7 +73,6 @@ struct _EWebViewPrivate {
enum {
PROP_0,
- PROP_ANIMATE,
PROP_CARET_MODE,
PROP_COPY_TARGET_LIST,
PROP_CURSOR_IMAGE,
@@ -589,12 +588,6 @@ web_view_set_property (GObject *object,
GParamSpec *pspec)
{
switch (property_id) {
- case PROP_ANIMATE:
- e_web_view_set_animate (
- E_WEB_VIEW (object),
- g_value_get_boolean (value));
- return;
-
case PROP_CARET_MODE:
e_web_view_set_caret_mode (
E_WEB_VIEW (object),
@@ -678,12 +671,6 @@ web_view_get_property (GObject *object,
GParamSpec *pspec)
{
switch (property_id) {
- case PROP_ANIMATE:
- g_value_set_boolean (
- value, e_web_view_get_animate (
- E_WEB_VIEW (object)));
- return;
-
case PROP_CARET_MODE:
g_value_set_boolean (
value, e_web_view_get_caret_mode (
@@ -1479,16 +1466,6 @@ e_web_view_class_init (EWebViewClass *class)
g_object_class_install_property (
object_class,
- PROP_ANIMATE,
- g_param_spec_boolean (
- "animate",
- "Animate Images",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
-
- g_object_class_install_property (
- object_class,
PROP_CARET_MODE,
g_param_spec_boolean (
"caret-mode",
@@ -2144,38 +2121,6 @@ e_web_view_install_js_callback (EWebView *web_view, const gchar *fnc_name, EWebV
}
gboolean
-e_web_view_get_animate (EWebView *web_view)
-{
-#if 0 /* WEBKIT - XXX No equivalent property? */
- /* XXX This is just here to maintain symmetry
- * with e_web_view_set_animate(). */
-
- g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE);
-
- return gtk_html_get_animate (GTK_HTML (web_view));
-#endif
-
- return FALSE;
-}
-
-void
-e_web_view_set_animate (EWebView *web_view,
- gboolean animate)
-{
-#if 0 /* WEBKIT - XXX No equivalent property? */
- /* XXX GtkHTML does not utilize GObject properties as well
- * as it could. This just wraps gtk_html_set_animate()
- * so we can get a "notify::animate" signal. */
-
- g_return_if_fail (E_IS_WEB_VIEW (web_view));
-
- gtk_html_set_animate (GTK_HTML (web_view), animate);
-
- g_object_notify (G_OBJECT (web_view), "animate");
-#endif
-}
-
-gboolean
e_web_view_get_caret_mode (EWebView *web_view)
{
g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE);
diff --git a/widgets/misc/e-web-view.h b/widgets/misc/e-web-view.h
index 1562d84..2d90cf9 100644
--- a/widgets/misc/e-web-view.h
+++ b/widgets/misc/e-web-view.h
@@ -133,9 +133,6 @@ void e_web_view_install_js_callback (EWebView *web_view,
EWebViewJSFunctionCallback callback,
gpointer user_data);
gchar * e_web_view_get_html (EWebView *web_view);
-gboolean e_web_view_get_animate (EWebView *web_view);
-void e_web_view_set_animate (EWebView *web_view,
- gboolean animate);
gboolean e_web_view_get_caret_mode (EWebView *web_view);
void e_web_view_set_caret_mode (EWebView *web_view,
gboolean caret_mode);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
