summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2013-07-11 17:34:15 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2013-07-11 17:34:15 +0200
commit8ad86283bd950eedd50585e1b84c28428aa5229a (patch)
tree8bb112ec98fa755d5563d6652ebc616cdc64c27e
parent6b4ab34d2a3f77c09aa12a75240b083cee43bbeb (diff)
downloadgobject-introspection-8ad86283bd950eedd50585e1b84c28428aa5229a.tar.gz
Update annotations from glib 2.37.4
-rw-r--r--gir/gio-2.0.c30
-rw-r--r--gir/glib-2.0.c14
2 files changed, 30 insertions, 14 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 5f9a5653..c530dd83 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -3943,7 +3943,7 @@
* |[
* void _theoretical_frobnitz_async (Theoretical *t,
* GCancellable *c,
- * GAsyncReadyCallback *cb,
+ * GAsyncReadyCallback cb,
* gpointer u);
*
* gboolean _theoretical_frobnitz_finish (Theoretical *t,
@@ -4045,7 +4045,7 @@
/**
* SECTION:gbytesicon
- * @short_description: An icon stored in memory as a #GBytes
+ * @short_description: An icon stored in memory as a GBytes
* @include: gio/gio.h
* @see_also: #GIcon, #GLoadableIcon, #GBytes
*
@@ -4702,7 +4702,7 @@
/**
* SECTION:gdbusutils
* @title: D-Bus Utilities
- * @short_description: Various utilities related to D-Bus.
+ * @short_description: Various utilities related to D-Bus
* @include: gio/gio.h
*
* Various utility routines related to D-Bus.
@@ -5873,7 +5873,7 @@
/**
* SECTION:gpollableutils
- * @short_description: #GPollableInputStream / #GPollableOutputStream utilities
+ * @short_description: Utilities for pollable streams
* @include: gio/gio.h
*
* Utility functions for #GPollableInputStream and
@@ -5918,7 +5918,7 @@
/**
* SECTION:gremoteactiongroup
* @title: GRemoteActionGroup
- * @short_description: a #GActionGroup that interacts with other processes
+ * @short_description: A GActionGroup that interacts with other processes
*
* The GRemoteActionGroup interface is implemented by #GActionGroup
* instances that either transmit action invocations to other processes
@@ -6296,7 +6296,7 @@
/**
* SECTION:gsettingsschema
- * @short_description: introspecting and controlling the loading of GSettings schemas
+ * @short_description: Introspecting and controlling the loading of GSettings schemas
*
* The #GSettingsSchemaSource and #GSettingsSchema APIs provide a
* mechanism for advanced control over the loading of schemas and a
@@ -6938,7 +6938,7 @@
* Eventually, you will call a method such as
* g_task_return_pointer() or g_task_return_error(), which will
* save the value you give it and then invoke the task's callback
- * function (waiting until the next next iteration of the main
+ * function (waiting until the next iteration of the main
* loop first, if necessary). The caller will pass the #GTask back
* to the operation's finish function (as a #GAsyncResult), and
* you can use g_task_propagate_pointer() or the like to extract
@@ -7461,7 +7461,7 @@
/**
* SECTION:gtcpwrapperconnection
* @title: GTcpWrapperConnection
- * @short_description: wrapper for non-GSocketConnection-based, GSocket-based GIOStreams
+ * @short_description: Wrapper for non-GSocketConnection-based, GSocket-based GIOStreams
* @see_also: #GSocketConnection.
*
* A #GTcpWrapperConnection can be used to wrap a #GIOStream that is
@@ -29235,6 +29235,20 @@
/**
+ * g_simple_proxy_resolver_set_ignore_hosts:
+ * @resolver: a #GSimpleProxyResolver
+ * @ignore_hosts: %NULL-terminated list of hosts/IP addresses to not use a proxy for
+ *
+ * Sets the list of ignored hosts.
+ *
+ * See #GSimpleProxyResolver:ignore-hosts for more details on how the
+ * @ignore_hosts argument is interpreted.
+ *
+ * Since: 2.36
+ */
+
+
+/**
* g_simple_proxy_resolver_set_uri_proxy:
* @resolver: a #GSimpleProxyResolver
* @uri_scheme: the URI scheme to add a proxy for
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 85d49c62..c0f244ba 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -25964,7 +25964,7 @@
* passing %NULL for @standard_output and @standard_error.
*
* If @exit_status is non-%NULL, the platform-specific exit status of
- * the child is stored there; see the doucumentation of
+ * the child is stored there; see the documentation of
* g_spawn_check_exit_status() for how to use and interpret this.
* Note that it is invalid to pass %G_SPAWN_DO_NOT_REAP_CHILD in
* @flags.
@@ -27356,7 +27356,8 @@
/**
* g_test_build_filename:
* @file_type: the type of file (built vs. distributed)
- * @first_path: the first segment of the pathname ...: NULL terminated additional path segments
+ * @first_path: the first segment of the pathname
+ * @...: %NULL-terminated additional path segments
*
* Creates the pathname to a data file that is required for a test.
*
@@ -27504,7 +27505,8 @@
/**
* g_test_get_filename:
* @file_type: the type of file (built vs. distributed)
- * @first_path: the first segment of the pathname ...: NULL terminated additional path segments
+ * @first_path: the first segment of the pathname
+ * @...: %NULL-terminated additional path segments
*
* Gets the pathname to a data file that is required for a test.
*
@@ -28127,13 +28129,13 @@
/**
* g_test_trap_subprocess:
- * @test_name: Test to run in a subprocess
+ * @test_path: Test to run in a subprocess
* @usec_timeout: Timeout for the subprocess test in micro seconds.
* @test_flags: Flags to modify subprocess behaviour.
*
- * Respawns the test program to run only @test_name in a subprocess.
+ * Respawns the test program to run only @test_path in a subprocess.
* This can be used for a test case that might not return, or that
- * might abort. @test_name will normally be the name of the parent
+ * might abort. @test_path will normally be the name of the parent
* test, followed by "<literal>/subprocess/</literal>" and then a name
* for the specific subtest (or just ending with
* "<literal>/subprocess</literal>" if the test only has one child