diff options
author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2012-11-21 16:59:55 +0100 |
---|---|---|
committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2012-11-28 21:31:21 +0100 |
commit | df8fc129e52e8fdb64d3b3dde42a2f98945532b5 (patch) | |
tree | b80683371f827557aade407f89781b809aea2b6b /gir | |
parent | 17fc978c081195dad1f6a66d69cc6e18423e6db5 (diff) | |
download | gobject-introspection-df8fc129e52e8fdb64d3b3dde42a2f98945532b5.tar.gz |
Update GLib annotations to master
https://bugzilla.gnome.org/show_bug.cgi?id=688897
Diffstat (limited to 'gir')
-rw-r--r-- | gir/gio-2.0.c | 7 | ||||
-rw-r--r-- | 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 cb1f6d21..1c64ec13 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 755f4c24..dc718cec 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 |