diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-09-16 14:58:39 -0600 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-09-16 14:58:45 -0600 |
| commit | 850d7b03c43b5ffecbfd7bf0682293ef62b7b19a (patch) | |
| tree | 235f35817227dc27c61a61d6ff76fdc0590aff2e | |
| parent | c9195de4e91d5c113a03f97762e0219a824f41c3 (diff) | |
| download | gobject-introspection-850d7b03c43b5ffecbfd7bf0682293ef62b7b19a.tar.gz | |
Update glib annotations from git master
| -rw-r--r-- | gir/gio-2.0.c | 4 | ||||
| -rw-r--r-- | gir/glib-2.0.c | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index ba8a8eee..d7a80472 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -5337,7 +5337,7 @@ * implements methods for getting information that all files should * contain, and allows for manipulation of extended attributes. * - * See [GFileAttribute][gio-GFileAttribute for more information on how + * See [GFileAttribute][gio-GFileAttribute] for more information on how * GIO handles file attributes. * * To obtain a #GFileInfo for a #GFile, use g_file_query_info() (or its @@ -18687,6 +18687,8 @@ * An application implements an interface if that interface is listed in * the Implements= line of the desktop file of the application. * + * Returns: (element-type GDesktopAppInfo) (transfer full): a list of #GDesktopAppInfo + * objects. * Since: 2.42 */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index de9db6b7..3e8cc42a 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -4997,9 +4997,11 @@ * An example using a #GPtrArray: * |[<!-- language="C" --> * GPtrArray *array; - * gchar *string1 = "one", *string2 = "two", *string3 = "three"; + * gchar *string1 = "one"; + * gchar *string2 = "two"; + * gchar *string3 = "three"; * - * gparray = g_ptr_array_new (); + * array = g_ptr_array_new (); * g_ptr_array_add (array, (gpointer) string1); * g_ptr_array_add (array, (gpointer) string2); * g_ptr_array_add (array, (gpointer) string3); @@ -29316,11 +29318,16 @@ * until it is destroyed by g_thread_pool_free(). If @exclusive is * %FALSE, threads are created when needed and shared between all * non-exclusive thread pools. This implies that @max_threads may - * not be -1 for exclusive thread pools. + * not be -1 for exclusive thread pools. Besides, exclusive thread + * pools are not affected by g_thread_pool_set_max_idle_time() + * since their threads are never considered idle and returned to the + * global pool. * * @error can be %NULL to ignore errors, or non-%NULL to report * errors. An error can only occur when @exclusive is set to %TRUE * and not all @max_threads threads could be created. + * See #GThreadError for possible errors that may occurr. + * Note, even in case of error a valid #GThreadPool is returned. * * Returns: the new #GThreadPool */ |