diff options
| -rw-r--r-- | gdk/gdkdrop.c | 12 | ||||
| -rw-r--r-- | gdk/gdkdrop.h | 2 | ||||
| -rw-r--r-- | gdk/gdkdropprivate.h | 2 | ||||
| -rw-r--r-- | gdk/wayland/gdkdrop-wayland.c | 2 | ||||
| -rw-r--r-- | gdk/wayland/gdkprimary-wayland.c | 2 | ||||
| -rw-r--r-- | gdk/win32/gdkdrop-win32.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkdrop-x11.c | 2 | ||||
| -rw-r--r-- | gtk/gtkdnd.c | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c index 643a74d790..ea85862a4c 100644 --- a/gdk/gdkdrop.c +++ b/gdk/gdkdrop.c @@ -149,8 +149,8 @@ gdk_drop_read_local_async (GdkDrop *self, static GInputStream * gdk_drop_read_local_finish (GdkDrop *self, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error) { g_return_val_if_fail (g_task_is_valid (result, self), NULL); @@ -622,8 +622,8 @@ gdk_drop_read_async (GdkDrop *self, /** * gdk_drop_read_finish: * @self: a #GdkDrop - * @out_mime_type: (out) (type utf8): return location for the used mime type * @result: a #GAsyncResult + * @out_mime_type: (out) (type utf8): return location for the used mime type * @error: (allow-none): location to store error information on failure, or %NULL * * Finishes an async drop read operation, see gdk_drop_read_async(). @@ -632,8 +632,8 @@ gdk_drop_read_async (GdkDrop *self, */ GInputStream * gdk_drop_read_finish (GdkDrop *self, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error) { g_return_val_if_fail (GDK_IS_DROP (self), NULL); @@ -641,11 +641,11 @@ gdk_drop_read_finish (GdkDrop *self, if (g_async_result_is_tagged (result, gdk_drop_read_local_async)) { - return gdk_drop_read_local_finish (self, out_mime_type, result, error); + return gdk_drop_read_local_finish (self, result, out_mime_type, error); } else { - return GDK_DROP_GET_CLASS (self)->read_finish (self, out_mime_type, result, error); + return GDK_DROP_GET_CLASS (self)->read_finish (self, result, out_mime_type, error); } } @@ -678,7 +678,7 @@ gdk_drop_read_value_got_stream (GObject *source, GTask *task = data; const char *mime_type; - stream = gdk_drop_read_finish (GDK_DROP (source), &mime_type, result, &error); + stream = gdk_drop_read_finish (GDK_DROP (source), result, &mime_type, &error); if (stream == NULL) { g_task_return_error (task, error); diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h index e2f26e1822..857d44082f 100644 --- a/gdk/gdkdrop.h +++ b/gdk/gdkdrop.h @@ -68,8 +68,8 @@ void gdk_drop_read_async (GdkDrop gpointer user_data); GDK_AVAILABLE_IN_ALL GInputStream * gdk_drop_read_finish (GdkDrop *self, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error); GDK_AVAILABLE_IN_ALL void gdk_drop_read_value_async (GdkDrop *self, diff --git a/gdk/gdkdropprivate.h b/gdk/gdkdropprivate.h index 86a1fdbf8a..b20eee2ae7 100644 --- a/gdk/gdkdropprivate.h +++ b/gdk/gdkdropprivate.h @@ -51,8 +51,8 @@ struct _GdkDropClass { GAsyncReadyCallback callback, gpointer user_data); GInputStream * (* read_finish) (GdkDrop *self, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error); }; diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c index a0a02a33b4..3e0a25deaa 100644 --- a/gdk/wayland/gdkdrop-wayland.c +++ b/gdk/wayland/gdkdrop-wayland.c @@ -224,8 +224,8 @@ gdk_wayland_drop_read_async (GdkDrop *drop, static GInputStream * gdk_wayland_drop_read_finish (GdkDrop *drop, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error) { GTask *task; diff --git a/gdk/wayland/gdkprimary-wayland.c b/gdk/wayland/gdkprimary-wayland.c index 98f75edc1f..767371527e 100644 --- a/gdk/wayland/gdkprimary-wayland.c +++ b/gdk/wayland/gdkprimary-wayland.c @@ -331,8 +331,8 @@ gdk_wayland_primary_read_async (GdkClipboard *clipboard, static GInputStream * gdk_wayland_primary_read_finish (GdkClipboard *clipboard, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error) { GInputStream *stream; diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c index e457ce12a4..44dab15c19 100644 --- a/gdk/win32/gdkdrop-win32.c +++ b/gdk/win32/gdkdrop-win32.c @@ -1382,8 +1382,8 @@ gdk_win32_drop_read_async (GdkDrop *drop, static GInputStream * gdk_win32_drop_read_finish (GdkDrop *drop, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error) { GTask *task; diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c index 050695bf9c..bb5fbef238 100644 --- a/gdk/x11/gdkdrop-x11.c +++ b/gdk/x11/gdkdrop-x11.c @@ -211,8 +211,8 @@ gdk_x11_drop_read_async (GdkDrop *drop, static GInputStream * gdk_x11_drop_read_finish (GdkDrop *drop, - const char **out_mime_type, GAsyncResult *result, + const char **out_mime_type, GError **error) { GTask *task; diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index b8e5389027..8c1312c383 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -244,7 +244,7 @@ gtk_drag_get_data_got_stream (GObject *source, GInputStream *input_stream; GOutputStream *output_stream; - input_stream = gdk_drop_read_finish (GDK_DROP (source), &data->mime_type, result, NULL); + input_stream = gdk_drop_read_finish (GDK_DROP (source), result, &data->mime_type, NULL); if (input_stream == NULL) { gtk_drag_get_data_finish (data, NULL, 0); |