summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2017-09-11 11:10:01 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2017-09-11 11:10:01 +0200
commit8e276ab531c76d8c297c963a8606a7d6c2ee1d73 (patch)
tree147f7b3f8d324e387c90b7570137d7d1af6e6112
parentdbf2106c68829141403c4877b4ed8dffaf6802c5 (diff)
downloadgobject-introspection-8e276ab531c76d8c297c963a8606a7d6c2ee1d73.tar.gz
gir: Update annotations from GLib 2.54.0
-rw-r--r--gir/gio-2.0.c2
-rw-r--r--gir/glib-2.0.c15
2 files changed, 10 insertions, 7 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 6c71c308..a5c4ce36 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -13638,7 +13638,7 @@
* "[A-Z][a-z][0-9]_-." and must not begin with a digit.
*
* - Application identifiers must contain at least one '.' (period)
- * character (and thus at least three elements).
+ * character (and thus at least two elements).
*
* - Application identifiers must not begin or end with a '.' (period)
* character.
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index c13bffa7..b9b82958 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -17489,8 +17489,7 @@
* destroyed. The default value of this is %TRUE for channels created
* by g_io_channel_new_file (), and %FALSE for all other channels.
*
- * Returns: Whether the channel will be closed on the final unref of
- * the GIOChannel data structure.
+ * Returns: %TRUE if the channel will be closed, %FALSE otherwise.
*/
@@ -17757,12 +17756,14 @@
* g_io_channel_set_close_on_unref:
* @channel: a #GIOChannel
* @do_close: Whether to close the channel on the final unref of
- * the GIOChannel data structure. The default value of
- * this is %TRUE for channels created by g_io_channel_new_file (),
- * and %FALSE for all other channels.
+ * the GIOChannel data structure.
+ *
+ * Whether to close the channel on the final unref of the #GIOChannel
+ * data structure. The default value of this is %TRUE for channels
+ * created by g_io_channel_new_file (), and %FALSE for all other channels.
*
* Setting this flag to %TRUE for a channel you have already closed
- * can cause problems.
+ * can cause problems when the final reference to the #GIOChannel is dropped.
*/
@@ -17879,6 +17880,8 @@
* is reading output from a command using via pipe, you may need to set
* the encoding to the encoding of the current locale (see
* g_get_charset()) with the g_io_channel_set_encoding() function.
+ * By default, the fd passed will not be closed when the final reference
+ * to the #GIOChannel data structure is dropped.
*
* If you want to read raw binary data without interpretation, then
* call the g_io_channel_set_encoding() function with %NULL for the