[glib] Revert accidental commit "dirt"
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib] Revert accidental commit "dirt"
- Date: Sat, 30 Jan 2010 21:01:32 +0000 (UTC)
commit 4c58a85dd1eb89fe45b8fc5730291238c057d63e
Author: Ryan Lortie <desrt desrt ca>
Date: Sat Jan 30 16:00:51 2010 -0500
Revert accidental commit "dirt"
This reverts commit c46bc6ba1fc8c5045c9a93b95e78e81936e2d954.
docs/reference/glib/Makefile.am | 1 -
docs/reference/glib/glib-sections.txt | 2 +
docs/reference/glib/tmpl/glib-unused.sgml | 847 ++---------------------------
docs/reference/glib/tmpl/macros_misc.sgml | 5 +-
docs/reference/glib/tmpl/version.sgml | 68 ---
5 files changed, 44 insertions(+), 879 deletions(-)
---
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index eb77b89..c7b9feb 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -27,7 +27,6 @@ IGNORE_HFILES= \
build \
gobject \
gio \
- asynchs.h \
config.h \
gdatasetprivate.h \
glibintl.h \
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 3b1cc1c..881eb18 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1379,6 +1379,7 @@ g_date_sunday_week_of_year
g_date_days_in_month
g_date_monday_weeks_in_year
g_date_sunday_weeks_in_year
+tm
</SECTION>
<SECTION>
@@ -2692,6 +2693,7 @@ g_assertion_message_error
g_test_add_vtable
GTestConfig
+g_test_config_vars
GTestLogType
GTestLogMsg
GTestLogBuffer
diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml
index 9dc1514..139c500 100644
--- a/docs/reference/glib/tmpl/glib-unused.sgml
+++ b/docs/reference/glib/tmpl/glib-unused.sgml
@@ -48,30 +48,6 @@ Desktop Entry Parser
-<!-- ##### SECTION ./tmpl/gvariant.sgml:Long_Description ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gvariant.sgml:See_Also ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SECTION ./tmpl/gvariant.sgml:Short_Description ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/gvariant.sgml:Stability_Level ##### -->
-
-
-
-<!-- ##### SECTION ./tmpl/gvariant.sgml:Title ##### -->
-GVariant
-
-
<!-- ##### SECTION ./tmpl/testutils.sgml:Long_Description ##### -->
<para>
@@ -230,45 +206,6 @@ the end of the string.
@G_MATCH_EXACT: a pattern matching exactly one string.
@G_MATCH_LAST:
-<!-- ##### STRUCT GVariant ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GVariantBuilder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ENUM GVariantBuilderError ##### -->
-<para>
-
-</para>
-
- G_VARIANT_BUILDER_ERROR_TOO_MANY:
- G_VARIANT_BUILDER_ERROR_TOO_FEW:
- G_VARIANT_BUILDER_ERROR_INFER:
- G_VARIANT_BUILDER_ERROR_TYPE:
-
-<!-- ##### ENUM GVariantFlags ##### -->
-<para>
-
-</para>
-
- G_VARIANT_LITTLE_ENDIAN:
- G_VARIANT_BIG_ENDIAN:
- G_VARIANT_TRUSTED:
- G_VARIANT_LAZY_BYTESWAP:
-
-<!-- ##### STRUCT GVariantIter ##### -->
-<para>
-
-</para>
-
- priv:
-
<!-- ##### USER_FUNCTION GWarningFunc ##### -->
<para>
Specifies the type of function passed to g_set_warning_handler().
@@ -330,12 +267,6 @@ not work.
</para>
-<!-- ##### MACRO G_VARIANT_BUILDER_ERROR ##### -->
-<para>
-
-</para>
-
-
<!-- ##### MACRO NAME_MAX ##### -->
<para>
Provided for UNIX emulation on Windows; equivalent to UNIX macro
@@ -946,791 +877,93 @@ Turns the argument into a string literal by using the '#' stringizing operator.
@x: text to convert to a literal string.
-<!-- ##### FUNCTION g_variant_builder_add ##### -->
-<para>
-
-</para>
-
- builder:
- format_string:
- Varargs:
-
-<!-- ##### FUNCTION g_variant_builder_add_value ##### -->
-<para>
-
-</para>
-
- builder:
- value:
-
-<!-- ##### FUNCTION g_variant_builder_cancel ##### -->
-<para>
-
-</para>
-
- builder:
-
-<!-- ##### FUNCTION g_variant_builder_check_add ##### -->
-<para>
-
-</para>
-
- builder:
- type:
- error:
- Returns:
-
-<!-- ##### FUNCTION g_variant_builder_check_end ##### -->
-<para>
-
-</para>
-
- builder:
- error:
- Returns:
-
-<!-- ##### FUNCTION g_variant_builder_close ##### -->
-<para>
-
-</para>
-
- child:
- Returns:
-
-<!-- ##### FUNCTION g_variant_builder_end ##### -->
-<para>
-
-</para>
-
- builder:
- Returns:
-
-<!-- ##### FUNCTION g_variant_builder_new ##### -->
-<para>
-
-</para>
-
- type:
- Returns:
-
-<!-- ##### FUNCTION g_variant_builder_open ##### -->
-<para>
-
-</para>
-
- parent:
- type:
- Returns:
-
-<!-- ##### FUNCTION g_variant_dup_string ##### -->
-<para>
-
-</para>
-
- value:
- length:
- Returns:
-
-<!-- ##### FUNCTION g_variant_dup_strv ##### -->
-<para>
-
-</para>
-
- value:
- length:
- Returns:
-
-<!-- ##### FUNCTION g_variant_flatten ##### -->
-<para>
-
-</para>
-
- value:
-
-<!-- ##### FUNCTION g_variant_format_string_scan ##### -->
-<para>
-
-</para>
-
- string:
- limit:
- endptr:
- Returns:
-
-<!-- ##### FUNCTION g_variant_from_data ##### -->
-<para>
-
-</para>
-
- type:
- data:
- size:
- flags:
- notify:
- user_data:
- Returns:
-
-<!-- ##### FUNCTION g_variant_from_file ##### -->
-<para>
-
-</para>
-
- type:
- filename:
- flags:
- error:
- Returns:
-
-<!-- ##### FUNCTION g_variant_from_slice ##### -->
-<para>
-
-</para>
-
- type:
- slice:
- size:
- flags:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get ##### -->
-<para>
-
-</para>
-
- value:
- format_string:
- Varargs:
-
-<!-- ##### FUNCTION g_variant_get_boolean ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_byte ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_child ##### -->
-<para>
-
-</para>
-
- value:
- index:
- format_string:
- Varargs:
-
-<!-- ##### FUNCTION g_variant_get_child_value ##### -->
-<para>
-
-</para>
-
- value:
- index:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_data ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_double ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_fixed ##### -->
-<para>
-
-</para>
-
- value:
- size:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_fixed_array ##### -->
-<para>
-
-</para>
-
- value:
- elem_size:
- length:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_handle ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_int16 ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_int32 ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_int64 ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_size ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_string ##### -->
-<para>
-
-</para>
-
- value:
- length:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_strv ##### -->
-<para>
-
-</para>
-
- value:
- length:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_type ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_type_string ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_uint16 ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_uint32 ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_uint64 ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_get_va ##### -->
-<para>
-
-</para>
-
- value:
- must_be_null:
- format_string:
- endptr:
- app:
-
-<!-- ##### FUNCTION g_variant_get_variant ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_has_type ##### -->
-<para>
-
-</para>
-
- value:
- pattern:
- Returns:
-
-<!-- ##### FUNCTION g_variant_is_basic ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_is_container ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_is_object_path ##### -->
-<para>
-
-</para>
-
- string:
- Returns:
-
-<!-- ##### FUNCTION g_variant_is_signature ##### -->
-<para>
-
-</para>
-
- string:
- Returns:
-
-<!-- ##### FUNCTION g_variant_iter_cancel ##### -->
-<para>
-
-</para>
-
- iter:
-
-<!-- ##### FUNCTION g_variant_iter_init ##### -->
-<para>
-
-</para>
-
- iter:
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_iter_next ##### -->
-<para>
-
-</para>
-
- iter:
- format_string:
- Varargs:
- Returns:
-
-<!-- ##### FUNCTION g_variant_iter_next_value ##### -->
-<para>
-
-</para>
-
- iter:
- Returns:
-
-<!-- ##### FUNCTION g_variant_iter_was_cancelled ##### -->
-<para>
-
-</para>
-
- iter:
- Returns:
-
-<!-- ##### FUNCTION g_variant_load ##### -->
-<para>
-
-</para>
-
- type:
- data:
- size:
- flags:
- Returns:
-
-<!-- ##### FUNCTION g_variant_lookup ##### -->
-<para>
-
-</para>
-
- dictionary:
- key:
- format_string:
- Varargs:
- Returns:
-
-<!-- ##### FUNCTION g_variant_lookup_value ##### -->
-<para>
-
-</para>
-
- dictionary:
- key:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_parse ##### -->
-<para>
-
-</para>
-
- text:
- text_len:
- type:
- error:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_parse_context_end ##### -->
-<para>
-
-</para>
-
- context:
- error:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_parse_context_new ##### -->
-<para>
-
-</para>
-
- flags:
- type:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_print ##### -->
-<para>
-
-</para>
-
- value:
- newlines:
- indentation:
- tabstop:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_print_string ##### -->
-<para>
-
-</para>
-
- value:
- string:
- newlines:
- indentation:
- tabstop:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_subparser_end ##### -->
-<para>
-
-</para>
-
- context:
- error:
- Returns:
-
-<!-- ##### FUNCTION g_variant_markup_subparser_start ##### -->
-<para>
-
-</para>
-
- context:
- type:
-
-<!-- ##### FUNCTION g_variant_n_children ##### -->
-<para>
-
-</para>
-
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new ##### -->
-<para>
-
-</para>
-
- format_string:
- Varargs:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_boolean ##### -->
-<para>
-
-</para>
-
- boolean:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_byte ##### -->
-<para>
-
-</para>
-
- byte:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_double ##### -->
-<para>
-
-</para>
-
- floating:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_handle ##### -->
-<para>
-
-</para>
-
- handle:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_int16 ##### -->
-<para>
-
-</para>
-
- int16:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_int32 ##### -->
-<para>
-
-</para>
-
- int32:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_int64 ##### -->
-<para>
-
-</para>
-
- int64:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_object_path ##### -->
-<para>
-
-</para>
-
- string:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_parsed ##### -->
-<para>
-
-</para>
-
- format:
- Varargs:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_parsed_va ##### -->
-<para>
-
-</para>
-
- format:
- app:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_signature ##### -->
-<para>
-
-</para>
-
- string:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_string ##### -->
-<para>
-
-</para>
-
- string:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_strv ##### -->
-<para>
-
-</para>
-
- strv:
- length:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_uint16 ##### -->
-<para>
-
-</para>
-
- uint16:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_uint32 ##### -->
-<para>
-
-</para>
-
- uint32:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_uint64 ##### -->
-<para>
-
-</para>
-
- uint64:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_va ##### -->
-<para>
-
-</para>
-
- must_be_null:
- format_string:
- endptr:
- app:
- Returns:
-
-<!-- ##### FUNCTION g_variant_new_variant ##### -->
+<!-- ##### FUNCTION g_warn_message ##### -->
<para>
</para>
- value:
- Returns:
+ domain:
+ file:
+ line:
+ func:
+ warnexpr:
-<!-- ##### FUNCTION g_variant_parse ##### -->
+<!-- ##### MACRO getcwd ##### -->
<para>
</para>
- text:
- text_length:
- type:
- error:
- Returns:
-<!-- ##### FUNCTION g_variant_parse_full ##### -->
+<!-- ##### MACRO getpid ##### -->
<para>
</para>
- text:
- limit:
- endptr:
- type:
- error:
- Returns:
-<!-- ##### FUNCTION g_variant_print ##### -->
+<!-- ##### VARIABLE glib_binary_age ##### -->
<para>
-
+This is the binary age passed to <application>libtool</application>. If
+<application>libtool</application> means nothing to you, don't worry
+about it. ;-)
</para>
- value:
- type_annotate:
- Returns:
-<!-- ##### FUNCTION g_variant_print_string ##### -->
+<!-- ##### FUNCTION glib_check_version ##### -->
<para>
</para>
- value:
- string:
- type_annotate:
+ required_major:
+ required_minor:
+ required_micro:
@Returns:
-<!-- ##### FUNCTION g_variant_ref ##### -->
+<!-- ##### VARIABLE glib_interface_age ##### -->
<para>
-
+This is the interface age passed to <application>libtool</application>. If
+<application>libtool</application> means nothing to you, don't worry
+about it. ;-)
</para>
- value:
- Returns:
-<!-- ##### FUNCTION g_variant_ref_sink ##### -->
+<!-- ##### VARIABLE glib_major_version ##### -->
<para>
-
+The major version number of the GLib library.
+(e.g. in GLib version 1.2.5 this is 1.)
</para>
- value:
- Returns:
-
-<!-- ##### FUNCTION g_variant_store ##### -->
<para>
-
+This variable is in the library, so represents the
+GLib library you have linked against. Contrast with the
+#GLIB_MAJOR_VERSION macro, which represents the major version of the
+GLib headers you have included.
</para>
- value:
- data:
-<!-- ##### FUNCTION g_variant_unref ##### -->
+<!-- ##### VARIABLE glib_micro_version ##### -->
<para>
-
+The micro version number of the GLib library.
+(e.g. in GLib version 1.2.5 this is 5.)
</para>
- value:
-
-<!-- ##### FUNCTION g_warn_message ##### -->
<para>
-
+This variable is in the library, so represents the GLib library you
+have linked against. Contrast with the #GLIB_MICRO_VERSION macro, which
+represents the micro version of the GLib headers you have included.
</para>
- domain:
- file:
- line:
- func:
- warnexpr:
-<!-- ##### MACRO getcwd ##### -->
+<!-- ##### VARIABLE glib_minor_version ##### -->
<para>
-
+The minor version number of the GLib library.
+(e.g. in GLib version 1.2.5 this is 2.)
</para>
-
-<!-- ##### MACRO getpid ##### -->
<para>
-
+This variable is in the library, so represents the
+GLib library you have linked against. Contrast with the
+#GLIB_MINOR_VERSION macro, which represents the minor version of the
+GLib headers you have included.
</para>
diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index 7ce3ff3..29ad670 100644
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -403,7 +403,7 @@ Since: 2.14
-<!-- ##### FUNCTION G_LIKELY ##### -->
+<!-- ##### MACRO G_LIKELY ##### -->
<para>
Hints the compiler that the expression is likely to evaluate to a true
value. The compiler may use this information for optimizations.
@@ -413,10 +413,9 @@ if (G_LIKELY (random () != 1))
g_print ("not one");
</programlisting></informalexample>
+ expr: the expression
@Returns: the value of @expr
@Since: 2.2
-<!-- # Unused Parameters # -->
- expr: the expression
<!-- ##### MACRO G_UNLIKELY ##### -->
diff --git a/docs/reference/glib/tmpl/version.sgml b/docs/reference/glib/tmpl/version.sgml
index f46c1e1..b1cf0bb 100644
--- a/docs/reference/glib/tmpl/version.sgml
+++ b/docs/reference/glib/tmpl/version.sgml
@@ -19,74 +19,6 @@ typically use the features described here.
<!-- ##### SECTION Stability_Level ##### -->
-<!-- ##### VARIABLE glib_major_version ##### -->
-<para>
-The major version number of the GLib library.
-(e.g. in GLib version 1.2.5 this is 1.)
-</para>
-
-<para>
-This variable is in the library, so represents the
-GLib library you have linked against. Contrast with the
-#GLIB_MAJOR_VERSION macro, which represents the major version of the
-GLib headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE glib_minor_version ##### -->
-<para>
-The minor version number of the GLib library.
-(e.g. in GLib version 1.2.5 this is 2.)
-</para>
-
-<para>
-This variable is in the library, so represents the
-GLib library you have linked against. Contrast with the
-#GLIB_MINOR_VERSION macro, which represents the minor version of the
-GLib headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE glib_micro_version ##### -->
-<para>
-The micro version number of the GLib library.
-(e.g. in GLib version 1.2.5 this is 5.)
-</para>
-
-<para>
-This variable is in the library, so represents the GLib library you
-have linked against. Contrast with the #GLIB_MICRO_VERSION macro, which
-represents the micro version of the GLib headers you have included.
-</para>
-
-
-<!-- ##### VARIABLE glib_binary_age ##### -->
-<para>
-This is the binary age passed to <application>libtool</application>. If
-<application>libtool</application> means nothing to you, don't worry
-about it. ;-)
-</para>
-
-
-<!-- ##### VARIABLE glib_interface_age ##### -->
-<para>
-This is the interface age passed to <application>libtool</application>. If
-<application>libtool</application> means nothing to you, don't worry
-about it. ;-)
-</para>
-
-
-<!-- ##### FUNCTION glib_check_version ##### -->
-<para>
-
-</para>
-
- required_major:
- required_minor:
- required_micro:
- Returns:
-
-
<!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
<para>
The major version number of the GLib library.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]