projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
678bcad
)
Allow null object in g_simple_async_report_gerror_in_idle
author
Christian Dywan
<christian@twotoasts.de>
Mon, 20 Dec 2010 16:15:15 +0000
(17:15 +0100)
committer
Christian Dywan
<christian@twotoasts.de>
Mon, 20 Dec 2010 16:22:19 +0000
(17:22 +0100)
Follow-up on bug 636673.
gio/gsimpleasyncresult.c
patch
|
blob
|
history
diff --git
a/gio/gsimpleasyncresult.c
b/gio/gsimpleasyncresult.c
index
458cf2e
..
30d5123
100644
(file)
--- a/
gio/gsimpleasyncresult.c
+++ b/
gio/gsimpleasyncresult.c
@@
-975,7
+975,7
@@
g_simple_async_report_error_in_idle (GObject *object,
/**
* g_simple_async_report_gerror_in_idle:
- * @object:
a #GObject.
+ * @object:
(allow-none): a #GObject, or %NULL
* @callback: a #GAsyncReadyCallback.
* @user_data: user data passed to @callback.
* @error: the #GError to report
@@
-992,7
+992,7
@@
g_simple_async_report_gerror_in_idle (GObject *object,
{
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);
simple = g_simple_async_result_new_from_error (object,