Merge branch 'master' into 'master'

Erase GI annotation: skip g_cancellable_source_new

Closes #1877

See merge request GNOME/glib!1048
This commit is contained in:
Philip Withnall 2019-10-08 10:33:40 +00:00
commit 0d94ee3bb4

View File

@ -725,7 +725,7 @@ static GSourceFuncs cancellable_source_funcs =
}; };
/** /**
* g_cancellable_source_new: (skip) * g_cancellable_source_new:
* @cancellable: (nullable): a #GCancellable, or %NULL * @cancellable: (nullable): a #GCancellable, or %NULL
* *
* Creates a source that triggers if @cancellable is cancelled and * Creates a source that triggers if @cancellable is cancelled and