diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-10-21 04:38:04 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-10-21 04:38:46 +0800 |
| commit | bb1f2813043338361f95b0431167a7454075243d (patch) | |
| tree | b5b3a029d66b2f64a0165ec21c309a237eb9c0a0 | |
| parent | 2587f7c220528f1ccb4ac41df7e30a31a5903d29 (diff) | |
| download | gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.gz gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.zst gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.zip | |
Bug 598567 - Can only insert local image files
| -rw-r--r-- | composer/e-msg-composer.c | 14 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 65bc2acf5e..9e3418a1f2 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2032,6 +2032,7 @@ msg_composer_uri_requested (GtkhtmlEditor *editor, const gchar *uri, GtkHTMLStream *stream) { + GtkhtmlEditorClass *editor_class; EMsgComposer *composer; GHashTable *hash_table; GByteArray *array; @@ -2054,10 +2055,8 @@ msg_composer_uri_requested (GtkhtmlEditor *editor, part = g_hash_table_lookup (hash_table, uri); } - if (part == NULL) { - gtk_html_end (html, stream, GTK_HTML_STREAM_ERROR); - return; - } + if (part == NULL) + goto chainup; array = g_byte_array_new (); camel_stream = camel_stream_mem_new_with_byte_array (array); @@ -2071,6 +2070,13 @@ msg_composer_uri_requested (GtkhtmlEditor *editor, camel_object_unref (camel_stream); gtk_html_end (html, stream, GTK_HTML_STREAM_OK); + + return; + +chainup: + /* Chain up to parent's uri_requested() method. */ + editor_class = GTKHTML_EDITOR_CLASS (parent_class); + editor_class->uri_requested (editor, uri, stream); } static void diff --git a/configure.ac b/configure.ac index 3825ae21c0..b1c2c398e6 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ m4_define([gtk_minimum_version], [2.16.0]) m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) -m4_define([libgtkhtml_minimum_version], [3.27.90]) +m4_define([libgtkhtml_minimum_version], [3.29.1]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libglade_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libgnomecanvas_minimum_version], [2.0.0]) dnl XXX Just a Guess |