From 8060a7a207192297e62d29b4e5e1b551eab48622 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 6 Sep 2011 10:55:09 -0400 Subject: [PATCH] 'master' is now glib 2.31.0 --- configure.ac | 4 ++-- docs/reference/glib/tmpl/date.sgml | 16 +++++++++++++--- docs/reference/glib/tmpl/fileutils.sgml | 29 +++++++++++++++++++++++++++++ docs/reference/glib/tmpl/glib-unused.sgml | 8 ++++++++ docs/reference/glib/tmpl/macros.sgml | 2 ++ docs/reference/glib/tmpl/messages.sgml | 27 ++++++--------------------- docs/reference/glib/tmpl/modules.sgml | 10 ++++++---- docs/reference/glib/tmpl/testing.sgml | 8 ++++++++ 8 files changed, 74 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index fa2529e..eaeeec5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ m4_define(glib_configure_ac) # on the unstable (ie master), interface age = 0 m4_define([glib_major_version], [2]) -m4_define([glib_minor_version], [29]) -m4_define([glib_micro_version], [90]) +m4_define([glib_minor_version], [31]) +m4_define([glib_micro_version], [0]) m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml index 4659d4c..85d0263 100644 --- a/docs/reference/glib/tmpl/date.sgml +++ b/docs/reference/glib/tmpl/date.sgml @@ -137,13 +137,23 @@ length of the sleep. @Returns: - + -@tv_sec: -@tv_nsec: +@void: +@Returns: + + + + + + + +@void: +@Returns: + diff --git a/docs/reference/glib/tmpl/fileutils.sgml b/docs/reference/glib/tmpl/fileutils.sgml index 7b65df6..058f7a2 100644 --- a/docs/reference/glib/tmpl/fileutils.sgml +++ b/docs/reference/glib/tmpl/fileutils.sgml @@ -247,6 +247,35 @@ A test to perform on a file using g_file_test(). @Returns: + + + + + +@tmpl: +@Returns: + + + + + + + +@tmpl: +@mode: +@Returns: + + + + + + + +@tmpl: +@error: +@Returns: + + An opaque structure representing an opened directory. diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml index 7b57189..7b5c3ed 100644 --- a/docs/reference/glib/tmpl/glib-unused.sgml +++ b/docs/reference/glib/tmpl/glib-unused.sgml @@ -234,6 +234,14 @@ the end of the string. @G_MATCH_EXACT: a pattern matching exactly one string. @G_MATCH_LAST: + + + + + +@tv_sec: +@tv_nsec: + Specifies the type of function passed to g_set_warning_handler(). diff --git a/docs/reference/glib/tmpl/macros.sgml b/docs/reference/glib/tmpl/macros.sgml index 33cab69..bb39506 100644 --- a/docs/reference/glib/tmpl/macros.sgml +++ b/docs/reference/glib/tmpl/macros.sgml @@ -229,3 +229,5 @@ turn it off. This macro should only be used for return values and for @Deprecated: 2.30: API providers should replace all existing uses with const and API consumers should adjust their code accordingly. + + diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml index 245a775..2c4e8d8 100644 --- a/docs/reference/glib/tmpl/messages.sgml +++ b/docs/reference/glib/tmpl/messages.sgml @@ -117,18 +117,15 @@ documentation. @args: the parameters to insert into the format string. - + A convenience function/macro to log a normal message. -@format: -@Varargs: - @...: format string, followed by parameters to insert into the format string (as with printf()) - + A convenience function/macro to log a warning message. @@ -138,13 +135,10 @@ You can make warnings fatal at runtime by setting the %G_DEBUG environment variable (see Running GLib Applications). -@format: -@Varargs: - @...: format string, followed by parameters to insert into the format string (as with printf()) - + Logs a "critical warning" (#G_LOG_LEVEL_CRITICAL). It's more or less application-defined what constitutes a critical vs. a regular @@ -159,13 +153,10 @@ the %G_DEBUG environment variable (see Running GLib Applications). -@format: -@Varargs: - @...: format string, followed by parameters to insert into the format string (as with printf()) - + A convenience function/macro to log an error message. Error messages are always fatal, resulting in a call to @@ -175,22 +166,16 @@ expect. Using this function indicates a bug in your program, i.e. an assertion failure. -@format: -@Varargs: - @...: format string, followed by parameters to insert into the format string (as with printf()) - + A convenience function/macro to log a debug message. -@format: -@Varargs: -@Since: 2.6 - @...: format string, followed by parameters to insert into the format string (as with printf()) +@Since: 2.6 diff --git a/docs/reference/glib/tmpl/modules.sgml b/docs/reference/glib/tmpl/modules.sgml index 51329d3..0b7ba74 100644 --- a/docs/reference/glib/tmpl/modules.sgml +++ b/docs/reference/glib/tmpl/modules.sgml @@ -147,7 +147,7 @@ used, though that is not recommended. prefix and suffix. This should be freed when no longer needed. - + Opens a module. If the module has already been opened, its reference count is incremented. @@ -164,11 +164,12 @@ appended and g_module_open() tries to open the corresponding module. If eventually that fails as well, %NULL is returned. +@Returns: a #GModule on success, or %NULL on failure. + @file_name: the name of the file containing the module, or %NULL to obtain a #GModule representing the main program itself. @flags: the flags used for opening the module. This can be the logical OR of any of the #GModuleFlags. -@Returns: a #GModule on success, or %NULL on failure. @@ -199,14 +200,15 @@ Note that a valid symbol can be %NULL. @Returns: %TRUE on success. - + Gets the filename from a #GModule. -@module: a #GModule. @Returns: the filename of the module, or "main" if the module is the main program itself. + +@module: a #GModule. diff --git a/docs/reference/glib/tmpl/testing.sgml b/docs/reference/glib/tmpl/testing.sgml index af7c3ca..966c8fe 100644 --- a/docs/reference/glib/tmpl/testing.sgml +++ b/docs/reference/glib/tmpl/testing.sgml @@ -198,6 +198,14 @@ Returns %TRUE if tests are run in quiet mode. @fteardown: + + + + + +@void: + + -- 2.7.4