diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-11-24 06:07:09 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-12-03 05:46:47 +0100 |
| commit | 3023d254ddfc1e2d11038a098366782b15d909af (patch) | |
| tree | 436564848e46804d7aecde122d6900b885a8176f /gdk/gdkclipboard.c | |
| parent | 9b78d76873c075aaac0e5d62382bfb1cd1ba065e (diff) | |
| download | gtk+-3023d254ddfc1e2d11038a098366782b15d909af.tar.gz | |
clipboard: Make value getters set the passed in value
Don't return a const GValue, that's ugly API. Instead require people to
pass in a preinitialized GValue and set that one.
Diffstat (limited to 'gdk/gdkclipboard.c')
| -rw-r--r-- | gdk/gdkclipboard.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c index 2b37270315..bd213625ff 100644 --- a/gdk/gdkclipboard.c +++ b/gdk/gdkclipboard.c @@ -347,13 +347,14 @@ gdk_clipboard_read_value_done (GObject *source, { GTask *task = data; GError *error = NULL; - const GValue *value; + GValue *value; + + value = g_task_get_task_data (task); - value = gdk_content_deserialize_finish (result, &error); - if (value == NULL) + if (!gdk_content_deserialize_finish (result, value, &error)) g_task_return_error (task, error); else - g_task_return_pointer (task, (gpointer) value, NULL); + g_task_return_pointer (task, value, NULL); g_object_unref (task); } @@ -377,7 +378,7 @@ gdk_clipboard_read_value_got_stream (GObject *source, gdk_content_deserialize_async (stream, mime_type, - GPOINTER_TO_SIZE (g_task_get_task_data (task)), + G_VALUE_TYPE (g_task_get_task_data (task)), g_task_get_priority (task), g_task_get_cancellable (task), gdk_clipboard_read_value_done, @@ -386,6 +387,13 @@ gdk_clipboard_read_value_got_stream (GObject *source, } static void +free_value (gpointer value) +{ + g_value_unset (value); + g_slice_free (GValue, value); +} + +static void gdk_clipboard_read_value_internal (GdkClipboard *clipboard, GType type, gpointer source_tag, @@ -396,6 +404,7 @@ gdk_clipboard_read_value_internal (GdkClipboard *clipboard, { GdkContentFormatsBuilder *builder; GdkContentFormats *formats; + GValue *value; GTask *task; builder = gdk_content_formats_builder_new (); @@ -406,7 +415,9 @@ gdk_clipboard_read_value_internal (GdkClipboard *clipboard, task = g_task_new (clipboard, cancellable, callback, user_data); g_task_set_priority (task, io_priority); g_task_set_source_tag (task, source_tag); - g_task_set_task_data (task, GSIZE_TO_POINTER (type), NULL); + value = g_slice_new0 (GValue); + g_value_init (value, type); + g_task_set_task_data (task, value, free_value); gdk_clipboard_read_internal (clipboard, formats, |