summaryrefslogtreecommitdiff
path: root/gir
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2012-06-05 11:19:33 -0400
committerColin Walters <walters@verbum.org>2012-06-05 11:19:33 -0400
commit2480e18596cd2cd9bf6268f253752a831414ac52 (patch)
tree1c92edb0ed254fc39fcecd99def61adde948f24f /gir
parent5b8f63cb767424008a0549a28177574eb7538be9 (diff)
downloadgobject-introspection-2480e18596cd2cd9bf6268f253752a831414ac52.tar.gz
Update annotations to glib 2.33.2
Diffstat (limited to 'gir')
-rw-r--r--gir/gio-2.0.c10
-rw-r--r--gir/glib-2.0.c30
-rw-r--r--gir/gobject-2.0.c9
3 files changed, 46 insertions, 3 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index f4883dfc..81987d80 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -241,6 +241,8 @@
* @add_platform_data: invoked (locally) to add 'platform data' to be sent to the primary instance when activating, opening or invoking actions
* @quit_mainloop: Used to be invoked on the primary instance when the use count of the application drops to zero (and after any inactivity timeout, if requested). Not used anymore since 2.32
* @run_mainloop: Used to be invoked on the primary instance from g_application_run() if the use-count is non-zero. Since 2.32, GApplication is iterating the main context directly and is not using @run_mainloop anymore
+ * @dbus_register: invoked locally during registration, if the application is using its D-Bus backend. You can use this to export extra objects on the bus, that need to exist before the application tries to own the bus name. The function is passed the #GDBusConnection to to session bus, and the object path that #GApplication will use to export is D-Bus API. If this function returns %TRUE, registration will proceed; otherwise registration will abort. Since: 2.34
+ * @dbus_unregister: invoked locally during unregistration, if the application is using its D-Bus backend. Use this to undo anything done by the @dbus_register vfunc. Since: 2.34
*
* Virtual function table for #GApplication.
*
@@ -3518,6 +3520,14 @@
* </xi:include>
* </programlisting>
* </example>
+ *
+ * <example id="gapplication-example-dbushooks"><title>Using extra D-Bus hooks with a GApplication</title>
+ * <programlisting>
+ * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gapplication-example-dbushooks.c">
+ * <xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback>
+ * </xi:include>
+ * </programlisting>
+ * </example>
*/
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 6c7b9f0f..7fa148c5 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -30424,6 +30424,11 @@
* Please note that the syntax of the format string is very likely to be
* extended in the future.
*
+ * @format_string determines the C types that are used for unpacking
+ * the values and also determines if the values are copied or borrowed,
+ * see the section on
+ * <link linkend='gvariant-format-strings-pointers'>GVariant Format Strings</link>.
+ *
* Since: 2.24
*/
@@ -30514,6 +30519,11 @@
* essentially a combination of g_variant_get_child_value() and
* g_variant_get().
*
+ * @format_string determines the C types that are used for unpacking
+ * the values and also determines if the values are copied or borrowed,
+ * see the section on
+ * <link linkend='gvariant-format-strings-pointers'>GVariant Format Strings</link>.
+ *
* Since: 2.24
*/
@@ -30921,6 +30931,11 @@
* g_variant_new_va() and g_variant_get_va() within a single actual
* varargs call by the user.
*
+ * @format_string determines the C types that are used for unpacking
+ * the values and also determines if the values are copied or borrowed,
+ * see the section on
+ * <link linkend='gvariant-format-strings-pointers'>GVariant Format Strings</link>.
+ *
* Since: 2.24
*/
@@ -31169,6 +31184,11 @@
* types, use the '&' prefix to avoid allocating any memory at all (and
* thereby avoiding the need to free anything as well).
*
+ * @format_string determines the C types that are used for unpacking
+ * the values and also determines if the values are copied or borrowed,
+ * see the section on
+ * <link linkend='gvariant-format-strings-pointers'>GVariant Format Strings</link>.
+ *
* Returns: %TRUE if a value was unpacked, or %FALSE if there was no value
* Since: 2.24
*/
@@ -31254,6 +31274,11 @@
* For a solution that is likely to be more convenient to C programmers
* when dealing with loops, see g_variant_iter_loop().
*
+ * @format_string determines the C types that are used for unpacking
+ * the values and also determines if the values are copied or borrowed,
+ * see the section on
+ * <link linkend='gvariant-format-strings-pointers'>GVariant Format Strings</link>.
+ *
* Returns: %TRUE if a value was unpacked, or %FALSE if there as no value
* Since: 2.24
*/
@@ -31312,7 +31337,10 @@
* this function returns %FALSE. Otherwise, it unpacks the returned
* value and returns %TRUE.
*
- * See g_variant_get() for information about @format_string.
+ * @format_string determines the C types that are used for unpacking
+ * the values and also determines if the values are copied or borrowed,
+ * see the section on
+ * <link linkend='gvariant-format-strings-pointers'>GVariant Format Strings</link>.
*
* Returns: %TRUE if a value was unpacked
* Since: 2.28
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 03257c87..36064b1a 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -2027,7 +2027,9 @@
* Increases the freeze count on @object. If the freeze count is
* non-zero, the emission of "notify" signals on @object is
* stopped. The signals are queued until the freeze count is decreased
- * to zero.
+ * to zero. Duplicate notifications are squashed so that at most one
+ * #GObject::notify signal is emitted for each property modified while the
+ * object is frozen.
*
* This is necessary for accessors that modify multiple properties to prevent
* premature notification while the object is still being modified.
@@ -2520,7 +2522,10 @@
*
* Reverts the effect of a previous call to
* g_object_freeze_notify(). The freeze count is decreased on @object
- * and when it reaches zero, all queued "notify" signals are emitted.
+ * and when it reaches zero, queued "notify" signals are emitted.
+ *
+ * Duplicate notifications for each property are squashed so that at most one
+ * #GObject::notify signal is emitted for each property.
*
* It is an error to call this function when the freeze count is zero.
*/