diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am index eb77b8988..c7b9feb3d 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 3b1cc1c66..881eb18bd 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
@@ -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 9dc15147e..139c5004a 100644 --- a/docs/reference/glib/tmpl/glib-unused.sgml +++ b/docs/reference/glib/tmpl/glib-unused.sgml @@ -48,30 +48,6 @@ Desktop Entry Parser - - - - - - - - - - - - - - - - - - - - - -GVariant - - @@ -230,45 +206,6 @@ the end of the string. @G_MATCH_EXACT: a pattern matching exactly one string. @G_MATCH_LAST: - - - - - - - - - - - - - - - - - -@G_VARIANT_BUILDER_ERROR_TOO_MANY: -@G_VARIANT_BUILDER_ERROR_TOO_FEW: -@G_VARIANT_BUILDER_ERROR_INFER: -@G_VARIANT_BUILDER_ERROR_TYPE: - - - - - - -@G_VARIANT_LITTLE_ENDIAN: -@G_VARIANT_BIG_ENDIAN: -@G_VARIANT_TRUSTED: -@G_VARIANT_LAZY_BYTESWAP: - - - - - - -@priv: - Specifies the type of function passed to g_set_warning_handler(). @@ -330,12 +267,6 @@ not work. - - - - - - Provided for UNIX emulation on Windows; equivalent to UNIX macro @@ -946,771 +877,6 @@ Turns the argument into a string literal by using the '#' stringizing operator. @x: text to convert to a literal string. - - - - - -@builder: -@format_string: -@Varargs: - - - - - - -@builder: -@value: - - - - - - -@builder: - - - - - - -@builder: -@type: -@error: -@Returns: - - - - - - -@builder: -@error: -@Returns: - - - - - - -@child: -@Returns: - - - - - - -@builder: -@Returns: - - - - - - -@type: -@Returns: - - - - - - -@parent: -@type: -@Returns: - - - - - - -@value: -@length: -@Returns: - - - - - - -@value: -@length: -@Returns: - - - - - - -@value: - - - - - - -@string: -@limit: -@endptr: -@Returns: - - - - - - -@type: -@data: -@size: -@flags: -@notify: -@user_data: -@Returns: - - - - - - -@type: -@filename: -@flags: -@error: -@Returns: - - - - - - -@type: -@slice: -@size: -@flags: -@Returns: - - - - - - -@value: -@format_string: -@Varargs: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@index: -@format_string: -@Varargs: - - - - - - -@value: -@index: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@size: -@Returns: - - - - - - -@value: -@elem_size: -@length: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@length: -@Returns: - - - - - - -@value: -@length: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@must_be_null: -@format_string: -@endptr: -@app: - - - - - - -@value: -@Returns: - - - - - - -@value: -@pattern: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@string: -@Returns: - - - - - - -@string: -@Returns: - - - - - - -@iter: - - - - - - -@iter: -@value: -@Returns: - - - - - - -@iter: -@format_string: -@Varargs: -@Returns: - - - - - - -@iter: -@Returns: - - - - - - -@iter: -@Returns: - - - - - - -@type: -@data: -@size: -@flags: -@Returns: - - - - - - -@dictionary: -@key: -@format_string: -@Varargs: -@Returns: - - - - - - -@dictionary: -@key: -@Returns: - - - - - - -@text: -@text_len: -@type: -@error: -@Returns: - - - - - - -@context: -@error: -@Returns: - - - - - - -@flags: -@type: -@Returns: - - - - - - -@value: -@newlines: -@indentation: -@tabstop: -@Returns: - - - - - - -@value: -@string: -@newlines: -@indentation: -@tabstop: -@Returns: - - - - - - -@context: -@error: -@Returns: - - - - - - -@context: -@type: - - - - - - -@value: -@Returns: - - - - - - -@format_string: -@Varargs: -@Returns: - - - - - - -@boolean: -@Returns: - - - - - - -@byte: -@Returns: - - - - - - -@floating: -@Returns: - - - - - - -@handle: -@Returns: - - - - - - -@int16: -@Returns: - - - - - - -@int32: -@Returns: - - - - - - -@int64: -@Returns: - - - - - - -@string: -@Returns: - - - - - - -@format: -@Varargs: -@Returns: - - - - - - -@format: -@app: -@Returns: - - - - - - -@string: -@Returns: - - - - - - -@string: -@Returns: - - - - - - -@strv: -@length: -@Returns: - - - - - - -@uint16: -@Returns: - - - - - - -@uint32: -@Returns: - - - - - - -@uint64: -@Returns: - - - - - - -@must_be_null: -@format_string: -@endptr: -@app: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@text: -@text_length: -@type: -@error: -@Returns: - - - - - - -@text: -@limit: -@endptr: -@type: -@error: -@Returns: - - - - - - -@value: -@type_annotate: -@Returns: - - - - - - -@value: -@string: -@type_annotate: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@Returns: - - - - - - -@value: -@data: - - - - - - -@value: - @@ -1734,6 +900,73 @@ Turns the argument into a string literal by using the '#' stringizing operator. + + +This is the binary age passed to libtool. If +libtool means nothing to you, don't worry +about it. ;-) + + + + + + + + +@required_major: +@required_minor: +@required_micro: +@Returns: + + + +This is the interface age passed to libtool. If +libtool means nothing to you, don't worry +about it. ;-) + + + + + +The major version number of the GLib library. +(e.g. in GLib version 1.2.5 this is 1.) + + + +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. + + + + + +The micro version number of the GLib library. +(e.g. in GLib version 1.2.5 this is 5.) + + + +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. + + + + + +The minor version number of the GLib library. +(e.g. in GLib version 1.2.5 this is 2.) + + + +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. + + + diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml index 7ce3ff38d..29ad67085 100644 --- a/docs/reference/glib/tmpl/macros_misc.sgml +++ b/docs/reference/glib/tmpl/macros_misc.sgml @@ -403,7 +403,7 @@ Since: 2.14 - + 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"); +@expr: the expression @Returns: the value of @expr @Since: 2.2 - -@expr: the expression diff --git a/docs/reference/glib/tmpl/version.sgml b/docs/reference/glib/tmpl/version.sgml index f46c1e1a5..b1cf0bb6f 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. - - -The major version number of the GLib library. -(e.g. in GLib version 1.2.5 this is 1.) - - - -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. - - - - - -The minor version number of the GLib library. -(e.g. in GLib version 1.2.5 this is 2.) - - - -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. - - - - - -The micro version number of the GLib library. -(e.g. in GLib version 1.2.5 this is 5.) - - - -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. - - - - - -This is the binary age passed to libtool. If -libtool means nothing to you, don't worry -about it. ;-) - - - - - -This is the interface age passed to libtool. If -libtool means nothing to you, don't worry -about it. ;-) - - - - - - - - -@required_major: -@required_minor: -@required_micro: -@Returns: - - The major version number of the GLib library.