summaryrefslogtreecommitdiff
path: root/gir/glib-2.0.c
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2018-04-22 10:51:13 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2018-04-22 11:00:00 +0200
commitcf758608312525fb1826027757412f2b62e77f7f (patch)
tree7fb577a4165503b33df1b581081f23cbb9fd806e /gir/glib-2.0.c
parent351de8f4fc2e6f4cbc633021de135840df9879e3 (diff)
downloadgobject-introspection-cf758608312525fb1826027757412f2b62e77f7f.tar.gz
gir: Update annotations from glib git master
Diffstat (limited to 'gir/glib-2.0.c')
-rw-r--r--gir/glib-2.0.c59
1 files changed, 55 insertions, 4 deletions
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index f9689fd3..a9cc893c 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -8350,10 +8350,17 @@
* #GTimeZone is a structure that represents a time zone, at no
* particular point in time. It is refcounted and immutable.
*
+ * Each time zone has an identifier (for example, ‘Europe/London’) which is
+ * platform dependent. See g_time_zone_new() for information on the identifier
+ * formats. The identifier of a time zone can be retrieved using
+ * g_time_zone_get_identifier().
+ *
* A time zone contains a number of intervals. Each interval has
- * an abbreviation to describe it, an offet to UTC and a flag indicating
- * if the daylight savings time is in effect during that interval. A
- * time zone always has at least one interval -- interval 0.
+ * an abbreviation to describe it (for example, ‘PDT’), an offet to UTC and a
+ * flag indicating if the daylight savings time is in effect during that
+ * interval. A time zone always has at least one interval — interval 0. Note
+ * that interval abbreviations are not the same as time zone identifiers
+ * (apart from ‘UTC’), and cannot be passed to g_time_zone_new().
*
* Every UTC time is contained within exactly one interval, but a given
* local time may be contained within zero, one or two intervals (due to
@@ -14366,6 +14373,17 @@
/**
+ * g_date_time_get_timezone:
+ * @datetime: a #GDateTime
+ *
+ * Get the time zone for this @datetime.
+ *
+ * Returns: (transfer none): the time zone
+ * Since: 2.58
+ */
+
+
+/**
* g_date_time_get_timezone_abbreviation:
* @datetime: a #GDateTime
*
@@ -30340,7 +30358,7 @@
* @str_array: a %NULL-terminated array of strings
*
* Returns the length of the given %NULL-terminated
- * string array @str_array.
+ * string array @str_array. @str_array must not be %NULL.
*
* Returns: length of @str_array.
* Since: 2.6
@@ -32000,6 +32018,24 @@
/**
+ * g_time_zone_get_identifier:
+ * @tz: a #GTimeZone
+ *
+ * Get the identifier of this #GTimeZone, as passed to g_time_zone_new().
+ * If the identifier passed at construction time was not recognised, `UTC` will
+ * be returned. If it was %NULL, the identifier of the local timezone at
+ * construction time will be returned.
+ *
+ * The identifier will be returned in the same format as provided at
+ * construction time: if provided as a time offset, that will be returned by
+ * this function.
+ *
+ * Returns: identifier for this timezone
+ * Since: 2.58
+ */
+
+
+/**
* g_time_zone_get_offset:
* @tz: a #GTimeZone
* @interval: an interval within the timezone
@@ -32122,6 +32158,21 @@
/**
+ * g_time_zone_new_offset:
+ * @seconds: offset to UTC, in seconds
+ *
+ * Creates a #GTimeZone corresponding to the given constant offset from UTC,
+ * in seconds.
+ *
+ * This is equivalent to calling g_time_zone_new() with a string in the form
+ * `[+|-]hh[:mm[:ss]]`.
+ *
+ * Returns: (transfer full): a timezone at the given offset from UTC
+ * Since: 2.58
+ */
+
+
+/**
* g_time_zone_new_utc:
*
* Creates a #GTimeZone corresponding to UTC.