luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_simple_async_report_error_in_idle with no object

Browse Source 
Document and allow passing of NULL for the object consistently to
_take_error and _report_error functions.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=636673
This commit is contained in:
Christian Dywan 2010-12-10 15:07:04 +01:00
parent f0354ff059
commit ddc126cf2c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/gsimpleasyncresult.c
View File

@ -299,8 +299,7 @@ g_simple_async_result_init (GSimpleAsyncResult *simple)
/** /**
* g_simple_async_result_new: * g_simple_async_result_new:
* @source_object: a #GObject the asynchronous function was called with, * @source_object: (allow-none): a #GObject, or %NULL.
* or %NULL.
* @callback: a #GAsyncReadyCallback. * @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback. * @user_data: user data passed to @callback.
* @source_tag: the asynchronous function. * @source_tag: the asynchronous function.
@ -333,7 +332,7 @@ g_simple_async_result_new (GObject *source_object,
/** /**
* g_simple_async_result_new_from_error: * g_simple_async_result_new_from_error:
* @source_object: a #GObject, or %NULL. * @source_object: (allow-none): a #GObject, or %NULL.
* @callback: a #GAsyncReadyCallback. * @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback. * @user_data: user data passed to @callback.
* @error: a #GError * @error: a #GError
@ -394,7 +393,7 @@ g_simple_async_result_new_take_error (GObject *source_object,
/** /**
* g_simple_async_result_new_error: * g_simple_async_result_new_error:
* @source_object: a #GObject, or %NULL. * @source_object: (allow-none): a #GObject, or %NULL.
* @callback: a #GAsyncReadyCallback. * @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback. * @user_data: user data passed to @callback.
* @domain: a #GQuark. * @domain: a #GQuark.
@ -935,7 +934,7 @@ g_simple_async_result_is_valid (GAsyncResult *result,
/** /**
* g_simple_async_report_error_in_idle: * g_simple_async_report_error_in_idle:
* @object: a #GObject. * @object: (allow-none): a #GObject, or %NULL.
* @callback: a #GAsyncReadyCallback. * @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback. * @user_data: user data passed to @callback.
* @domain: a #GQuark containing the error domain (usually #G_IO_ERROR). * @domain: a #GQuark containing the error domain (usually #G_IO_ERROR).
@ -959,7 +958,7 @@ g_simple_async_report_error_in_idle (GObject *object,
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
va_list args; va_list args;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (!object || G_IS_OBJECT (object));
g_return_if_fail (domain != 0); g_return_if_fail (domain != 0);
g_return_if_fail (format != NULL); g_return_if_fail (format != NULL);
@ -1006,7 +1005,7 @@ g_simple_async_report_gerror_in_idle (GObject *object,
/** /**
* g_simple_async_report_take_gerror_in_idle: * g_simple_async_report_take_gerror_in_idle:
* @object: a #GObject. * @object: (allow-none): a #GObject, or %NULL
* @callback: a #GAsyncReadyCallback. * @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback. * @user_data: user data passed to @callback.
* @error: the #GError to report * @error: the #GError to report
@ -1025,7 +1024,7 @@ g_simple_async_report_take_gerror_in_idle (GObject *object,
{ {
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
g_return_if_fail (G_IS_OBJECT (object)); g_return_if_fail (!object || G_IS_OBJECT (object));
g_return_if_fail (error != NULL); g_return_if_fail (error != NULL);
simple = g_simple_async_result_new_take_error (object, simple = g_simple_async_result_new_take_error (object,