diff options
author | Martin Pitt <martinpitt@gnome.org> | 2013-09-02 11:18:16 +0200 |
---|---|---|
committer | Martin Pitt <martinpitt@gnome.org> | 2013-09-02 11:18:16 +0200 |
commit | 9423c65cc47eb68c13b43efeb4198b27fc33cf0a (patch) | |
tree | 94643cbd626812ecf85e13d05c6356aae35c1753 /gir/glib-2.0.c | |
parent | c2bc74b5e8d7c22bf675a334adafa44c0740af9f (diff) | |
download | gobject-introspection-9423c65cc47eb68c13b43efeb4198b27fc33cf0a.tar.gz |
Update annotations from glib git
Diffstat (limited to 'gir/glib-2.0.c')
-rw-r--r-- | gir/glib-2.0.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index a01b5d27..b69ff335 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -11312,6 +11312,8 @@ * function over the call provided by the system; on Unix, it will * attempt to correctly handle %EINTR, which has platform-specific * semantics. + * + * Since: 2.36 */ @@ -12908,7 +12910,23 @@ * <varlistentry><term> * <literal>\%z</literal>: * </term><listitem><simpara> - * the time-zone as hour offset from UTC + * the time zone as an offset from UTC (+hhmm) + * </simpara></listitem></varlistentry> + * <varlistentry><term> + * <literal>\%:z</literal>: + * </term><listitem><simpara> + * the time zone as an offset from UTC (+hh:mm). This is a gnulib strftime extension. Since: 2.38 + * </simpara></listitem></varlistentry> + * <varlistentry><term> + * <literal>\%::z</literal>: + * </term><listitem><simpara> + * the time zone as an offset from UTC (+hh:mm:ss). This is a gnulib strftime extension. Since: 2.38 + * </simpara></listitem></varlistentry> + * <varlistentry><term> + * <literal>\%:::z</literal>: + * </term><listitem><simpara> + * the time zone as an offset from UTC, with : to necessary precision + * (e.g., -04, +05:30). This is a gnulib strftime extension. Since: 2.38 * </simpara></listitem></varlistentry> * <varlistentry><term> * <literal>\%Z</literal>: @@ -27485,7 +27503,7 @@ /** * g_test_expect_message: - * @log_domain: the log domain of the message + * @log_domain: (allow-none): the log domain of the message * @log_level: the log level of the message * @pattern: a glob-style <link linkend="glib-Glob-style-pattern-matching">pattern</link> * |