aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-10-21 04:38:04 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-21 04:38:46 +0800
commitbb1f2813043338361f95b0431167a7454075243d (patch)
treeb5b3a029d66b2f64a0165ec21c309a237eb9c0a0 /composer
parent2587f7c220528f1ccb4ac41df7e30a31a5903d29 (diff)
downloadgsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar
gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.gz
gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.bz2
gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.lz
gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.xz
gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.tar.zst
gsoc2013-evolution-bb1f2813043338361f95b0431167a7454075243d.zip
Bug 598567 - Can only insert local image files
Diffstat (limited to 'composer')
-rw-r--r--composer/e-msg-composer.c14
1 files changed, 10 insertions, 4 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