commit 8060a7a207192297e62d29b4e5e1b551eab48622
Author: Ryan Lortie <desrt desrt ca>
Date: Tue Sep 6 10:55:09 2011 -0400
'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)
# <mclasen> 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:
-<!-- ##### STRUCT GTimeSpec ##### -->
+<!-- ##### FUNCTION g_get_monotonic_time ##### -->
<para>
</para>
- tv_sec:
- tv_nsec:
+ void:
+ Returns:
+
+
+<!-- ##### FUNCTION g_get_real_time ##### -->
+<para>
+
+</para>
+
+ void:
+ Returns:
+
<!-- ##### STRUCT GDate ##### -->
<para>
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:
+<!-- ##### FUNCTION g_mkdtemp ##### -->
+<para>
+
+</para>
+
+ tmpl:
+ Returns:
+
+
+<!-- ##### FUNCTION g_mkdtemp_full ##### -->
+<para>
+
+</para>
+
+ tmpl:
+ mode:
+ Returns:
+
+
+<!-- ##### FUNCTION g_dir_make_tmp ##### -->
+<para>
+
+</para>
+
+ tmpl:
+ error:
+ Returns:
+
+
<!-- ##### STRUCT GDir ##### -->
<para>
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:
+<!-- ##### STRUCT GTimeSpec ##### -->
+<para>
+
+</para>
+
+ tv_sec:
+ tv_nsec:
+
<!-- ##### USER_FUNCTION GWarningFunc ##### -->
<para>
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
<literal>const</literal> 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.
-<!-- ##### FUNCTION g_message ##### -->
+<!-- ##### MACRO g_message ##### -->
<para>
A convenience function/macro to log a normal message.
</para>
- format:
- Varargs:
-<!-- # Unused Parameters # -->
@...: format string, followed by parameters to insert into the format string (as with printf())
-<!-- ##### FUNCTION g_warning ##### -->
+<!-- ##### MACRO g_warning ##### -->
<para>
A convenience function/macro to log a warning message.
</para>
@@ -138,13 +135,10 @@ You can make warnings fatal at runtime by setting the %G_DEBUG environment
variable (see <ulink url="glib-running.html">Running GLib Applications</ulink>).
</para>
- format:
- Varargs:
-<!-- # Unused Parameters # -->
@...: format string, followed by parameters to insert into the format string (as with printf())
-<!-- ##### FUNCTION g_critical ##### -->
+<!-- ##### MACRO g_critical ##### -->
<para>
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
<ulink url="glib-running.html">Running GLib Applications</ulink>).
</para>
- format:
- Varargs:
-<!-- # Unused Parameters # -->
@...: format string, followed by parameters to insert into the format string (as with printf())
-<!-- ##### FUNCTION g_error ##### -->
+<!-- ##### MACRO g_error ##### -->
<para>
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.
</para>
- format:
- Varargs:
-<!-- # Unused Parameters # -->
@...: format string, followed by parameters to insert into the format string (as with printf())
-<!-- ##### FUNCTION g_debug ##### -->
+<!-- ##### MACRO g_debug ##### -->
<para>
A convenience function/macro to log a debug message.
</para>
- format:
- Varargs:
- Since: 2.6
-<!-- # Unused Parameters # -->
@...: format string, followed by parameters to insert into the format string (as with printf())
+ Since: 2.6
<!-- ##### FUNCTION g_log_set_handler ##### -->
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.
-<!-- ##### FUNCTION g_module_open ##### -->
+<!-- ##### MACRO g_module_open ##### -->
<para>
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.
</para>
+ Returns: a #GModule on success, or %NULL on failure.
+<!-- # Unused Parameters # -->
@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.
<!-- ##### ENUM GModuleFlags ##### -->
@@ -199,14 +200,15 @@ Note that a valid symbol can be %NULL.
@Returns: %TRUE on success.
-<!-- ##### FUNCTION g_module_name ##### -->
+<!-- ##### MACRO g_module_name ##### -->
<para>
Gets the filename from a #GModule.
</para>
- module: a #GModule.
@Returns: the filename of the module, or "main" if the module is the main
program itself.
+<!-- # Unused Parameters # -->
+ module: a #GModule.
<!-- ##### FUNCTION g_module_make_resident ##### -->
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:
+<!-- ##### FUNCTION g_test_fail ##### -->
+<para>
+
+</para>
+
+ void:
+
+
<!-- ##### FUNCTION g_test_message ##### -->
<para>