projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gio: Fix regression encoding an array of doubles
[platform/upstream/glib.git]
/
gio
/
gcancellable.c
diff --git
a/gio/gcancellable.c
b/gio/gcancellable.c
index
6c3254d
..
fcfca3f
100644
(file)
--- a/
gio/gcancellable.c
+++ b/
gio/gcancellable.c
@@
-106,13
+106,12
@@
g_cancellable_class_init (GCancellableClass *klass)
*
* An example of how to us this:
* |[<!-- language="C" -->
*
* An example of how to us this:
* |[<!-- language="C" -->
- * /
* Make sure we don't do unnecessary work if already cancelled */
+ * /
/ Make sure we don't do unnecessary work if already cancelled
* if (g_cancellable_set_error_if_cancelled (cancellable, error))
* return;
*
* if (g_cancellable_set_error_if_cancelled (cancellable, error))
* return;
*
- * /* Set up all the data needed to be able to
- * * handle cancellation of the operation
- * */
+ * // Set up all the data needed to be able to handle cancellation
+ * // of the operation
* my_data = my_data_new (...);
*
* id = 0;
* my_data = my_data_new (...);
*
* id = 0;
@@
-121,13
+120,12
@@
g_cancellable_class_init (GCancellableClass *klass)
* G_CALLBACK (cancelled_handler)
* data, NULL);
*
* G_CALLBACK (cancelled_handler)
* data, NULL);
*
- * /
* cancellable operation here... */
+ * /
/ cancellable operation here...
*
* g_cancellable_disconnect (cancellable, id);
*
*
* g_cancellable_disconnect (cancellable, id);
*
- * /* cancelled_handler is never called after this,
- * * it is now safe to free the data
- * */
+ * // cancelled_handler is never called after this, it is now safe
+ * // to free the data
* my_data_free (my_data);
* ]|
*
* my_data_free (my_data);
* ]|
*
@@
-223,8
+221,8
@@
g_cancellable_pop_current (GCancellable *cancellable)
*
* Gets the top cancellable from the stack.
*
*
* Gets the top cancellable from the stack.
*
- * Returns: (
transfer none): a #GCancellable from the top of the stack, or %NULL
- * if the stack is empty.
+ * Returns: (
nullable) (transfer none): a #GCancellable from the top
+ *
of the stack, or %NULL
if the stack is empty.
**/
GCancellable *
g_cancellable_get_current (void)
**/
GCancellable *
g_cancellable_get_current (void)
@@
-717,7
+715,7
@@
static GSourceFuncs cancellable_source_funcs =
* For convenience, you can call this with a %NULL #GCancellable,
* in which case the source will never trigger.
*
* For convenience, you can call this with a %NULL #GCancellable,
* in which case the source will never trigger.
*
- * Return
value
: (transfer full): the new #GSource.
+ * Return
s
: (transfer full): the new #GSource.
*
* Since: 2.28
*/
*
* Since: 2.28
*/