aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/e-msg-composer.c14
-rw-r--r--configure.ac2
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