diff options
| author | Benjamin Otte <otte.benjamin@googlemail.com> | 2018-07-19 13:59:21 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte.benjamin@googlemail.com> | 2018-07-19 13:59:21 +0000 |
| commit | 4063c3dc3106cd024ecb4381af571271db372525 (patch) | |
| tree | 5d6cf0449da9d148b6db858bee4a21e33d9d3d1c | |
| parent | 1030d9e5b12e880e55f6bd3184dc6f3646be2e19 (diff) | |
| parent | 96d036829050b92632166981016786bb268f6cca (diff) | |
| download | gtk+-4063c3dc3106cd024ecb4381af571271db372525.tar.gz | |
Merge branch 'content-deserializer-fixes' into 'master'
Content deserializer fixes
See merge request GNOME/gtk!252
| -rw-r--r-- | gdk/gdkcontentdeserializer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gdk/gdkcontentdeserializer.c b/gdk/gdkcontentdeserializer.c index b0df54cb12..93564e2002 100644 --- a/gdk/gdkcontentdeserializer.c +++ b/gdk/gdkcontentdeserializer.c @@ -716,8 +716,7 @@ file_uri_deserializer_finish (GObject *source, return; } - str = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM ( - g_filter_output_stream_get_base_stream (G_FILTER_OUTPUT_STREAM (stream)))); + str = g_memory_output_stream_steal_data (G_MEMORY_OUTPUT_STREAM (stream)); uris = g_uri_list_extract_uris (str); g_free (str); @@ -738,6 +737,8 @@ file_uri_deserializer_finish (GObject *source, g_value_take_boxed (value, g_slist_reverse (l)); } g_strfreev (uris); + + gdk_content_deserializer_return_success (deserializer); } static void |