[gobject-introspection] Update GLib annotations to master
- From: Dieter Verfaillie <dieterv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Update GLib annotations to master
- Date: Wed, 28 Nov 2012 20:56:30 +0000 (UTC)
commit df8fc129e52e8fdb64d3b3dde42a2f98945532b5
Author: Dieter Verfaillie <dieterv optionexplicit be>
Date: Wed Nov 21 16:59:55 2012 +0100
Update GLib annotations to master
https://bugzilla.gnome.org/show_bug.cgi?id=688897
gir/gio-2.0.c | 7 +++++--
gir/gobject-2.0.c | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index cb1f6d2..1c64ec1 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -4248,7 +4248,10 @@
* </programlisting></example>
* With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and
* other peers will see the D-Bus error name <literal>org.project.Foo.Bar.Error.AnotherError</literal>.
- * If the other peer is using GDBus, the peer will see also %FOO_BAR_ERROR_ANOTHER_ERROR instead
+ *
+ * If the other peer is using GDBus, and has registered the association with
+ * g_dbus_error_register_error_domain() in advance (e.g. by invoking the %FOO_BAR_ERROR quark
+ * generation itself in the previous example) the peer will see also %FOO_BAR_ERROR_ANOTHER_ERROR instead
* of %G_IO_ERROR_DBUS_ERROR. Note that GDBus clients can still recover
* <literal>org.project.Foo.Bar.Error.AnotherError</literal> using g_dbus_error_get_remote_error().
*
@@ -4616,7 +4619,7 @@
* #GDrive is a container class for #GVolume objects that stem from
* the same piece of media. As such, #GDrive abstracts a drive with
* (or without) removable media and provides operations for querying
- * whether media is available, determing whether media change is
+ * whether media is available, determining whether media change is
* automatically detected and ejecting the media.
*
* If the #GDrive reports that media isn't automatically detected, one
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 755f4c2..dc718ce 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -4259,7 +4259,7 @@
* structures.
*
* Note that the accumulated size of the private structures of
- * a type and all its parent types cannot excced 64 KiB.
+ * a type and all its parent types cannot exceed 64 KiB.
*
* This function should be called in the type's class_init() function.
* The private structure can be retrieved using the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]