From 8ee6344419a07cff039cccd8c738cafde04fdf03 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 29 Dec 2000 15:11:03 +0000 Subject: [PATCH] we can't grow _cv_ variables by using a backticked expr that refers back Fri Dec 29 14:53:18 2000 Tim Janik * configure.in: we can't grow _cv_ variables by using a backticked expr that refers back to the variable (glib_cv_sizeof_system_thread for G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time it's evaluated. quantum states, anyone?) --- ChangeLog | 7 + ChangeLog.pre-2-0 | 7 + ChangeLog.pre-2-10 | 7 + ChangeLog.pre-2-12 | 7 + ChangeLog.pre-2-2 | 7 + ChangeLog.pre-2-4 | 7 + ChangeLog.pre-2-6 | 7 + ChangeLog.pre-2-8 | 7 + acconfig.h | 1 + configure.in | 21 +- docs/reference/glib/tmpl/arrays.sgml | 19 + docs/reference/glib/tmpl/arrays_byte.sgml | 19 + docs/reference/glib/tmpl/arrays_pointer.sgml | 19 + docs/reference/glib/tmpl/caches.sgml | 6 +- docs/reference/glib/tmpl/completion.sgml | 1 + docs/reference/glib/tmpl/conversions.sgml | 59 +- docs/reference/glib/tmpl/date.sgml | 118 +++ docs/reference/glib/tmpl/fileutils.sgml | 20 + docs/reference/glib/tmpl/glib-unused.sgml | 725 +----------------- docs/reference/glib/tmpl/hash_tables.sgml | 19 +- docs/reference/glib/tmpl/iochannels.sgml | 12 +- .../glib/tmpl/linked_lists_double.sgml | 11 + .../glib/tmpl/linked_lists_single.sgml | 11 + docs/reference/glib/tmpl/main.sgml | 368 ++++++++- docs/reference/glib/tmpl/markup.sgml | 115 +++ docs/reference/glib/tmpl/memory.sgml | 29 +- docs/reference/glib/tmpl/modules.sgml | 9 + docs/reference/glib/tmpl/random_numbers.sgml | 50 +- docs/reference/glib/tmpl/relations.sgml | 4 +- docs/reference/glib/tmpl/shell.sgml | 8 +- docs/reference/glib/tmpl/strings.sgml | 10 + docs/reference/glib/tmpl/trees-binary.sgml | 10 + .../gobject/tmpl/gobject-unused.sgml | 229 +++++- docs/reference/gobject/tmpl/objects.sgml | 114 +-- docs/reference/gobject/tmpl/param_specs.sgml | 57 +- docs/reference/gobject/tmpl/signals.sgml | 10 - .../gobject/tmpl/standard_params.sgml | 1 - docs/reference/gobject/tmpl/types.sgml | 35 +- 38 files changed, 1156 insertions(+), 1010 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a5332673..45d78351c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5a5332673..45d78351c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri Dec 29 14:53:18 2000 Tim Janik + + * configure.in: we can't grow _cv_ variables by using a backticked + expr that refers back to the variable (glib_cv_sizeof_system_thread for + G_THREAD_USE_PID_SURROGATE), that'd keep the variable growing every time + it's evaluated. quantum states, anyone?) + Thu Dec 28 10:21:46 2000 Tim Janik * gmem.[hc]: got rid of outdated dmalloc support. provide g_try_malloc() diff --git a/acconfig.h b/acconfig.h index c048af23c..cb9e82c6c 100644 --- a/acconfig.h +++ b/acconfig.h @@ -45,3 +45,4 @@ #undef USE_LIBICONV #undef SANE_MALLOC_PROTOS +#undef GLIB_SIZEOF_SYSTEM_THREAD diff --git a/configure.in b/configure.in index afe2fe285..ec712151d 100644 --- a/configure.in +++ b/configure.in @@ -1037,9 +1037,8 @@ if test x"$have_threads" != xnone; then if test x"$have_threads" = xposix; then glib_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" - GLIB_SIZEOF([#include ], - pthread_t, - system_thread) + dnl we might grow sizeof(pthread_t) later on, so use a dummy name here + GLIB_SIZEOF([#include ], pthread_t, core_system_thread) # This is not AC_CHECK_FUNC to also work with function # name mangling in header files. AC_MSG_CHECKING(for pthread_attr_setstacksize) @@ -1093,6 +1092,7 @@ if test x"$have_threads" != xnone; then CPPFLAGS="$glib_save_CPPFLAGS" AC_MSG_CHECKING(whether to use the PID niceness surrogate for thread priorities) + glib_system_thread_size_growth=0 AC_TRY_RUN([#include #include #include @@ -1108,16 +1108,15 @@ if test x"$have_threads" != xnone; then $posix_priority_min != $posix_priority_max); }], [AC_MSG_RESULT(yes), - AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, - [whether to use the PID niceness surrogate for thread priorities]) - - glib_cv_sizeof_system_thread=`expr $glib_cv_sizeof_system_thread + $ac_cv_sizeof_long`], + AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities]) + glib_system_thread_size_growth=$ac_cv_sizeof_long + ], [AC_MSG_RESULT(no)]) - + dnl make sure both glib_cv_sizeof_system_thread and GLIB_SIZEOF_SYSTEM_THREAD are setup + glib_cv_sizeof_system_thread=`expr $glib_cv_sizeof_core_system_thread + $glib_system_thread_size_growth` + AC_DEFINE_UNQUOTED(GLIB_SIZEOF_SYSTEM_THREAD, $glib_cv_sizeof_system_thread) else # solaris threads - GLIB_SIZEOF([#include ], - thread_t, - system_thread) + GLIB_SIZEOF([#include ], thread_t, system_thread) fi LIBS="$glib_save_LIBS" diff --git a/docs/reference/glib/tmpl/arrays.sgml b/docs/reference/glib/tmpl/arrays.sgml index bf1f0d155..f4eea22b3 100644 --- a/docs/reference/glib/tmpl/arrays.sgml +++ b/docs/reference/glib/tmpl/arrays.sgml @@ -209,6 +209,25 @@ g_array_remove_index(). @Returns: the #GArray. + + + + + +@array: +@compare_func: + + + + + + + +@array: +@compare_func: +@user_data: + + Returns the element of a #GArray at the given index. diff --git a/docs/reference/glib/tmpl/arrays_byte.sgml b/docs/reference/glib/tmpl/arrays_byte.sgml index 0a454e63b..9d2fb8397 100644 --- a/docs/reference/glib/tmpl/arrays_byte.sgml +++ b/docs/reference/glib/tmpl/arrays_byte.sgml @@ -123,6 +123,25 @@ g_byte_array_remove_index(). @Returns: the #GByteArray. + + + + + +@array: +@compare_func: + + + + + + + +@array: +@compare_func: +@user_data: + + Sets the size of the #GByteArray, expanding it if necessary. diff --git a/docs/reference/glib/tmpl/arrays_pointer.sgml b/docs/reference/glib/tmpl/arrays_pointer.sgml index fa6659a32..f44d90f9e 100644 --- a/docs/reference/glib/tmpl/arrays_pointer.sgml +++ b/docs/reference/glib/tmpl/arrays_pointer.sgml @@ -156,6 +156,25 @@ g_ptr_array_remove_index(). @Returns: the pointer which was removed. + + + + + +@array: +@compare_func: + + + + + + + +@array: +@compare_func: +@user_data: + + Sets the size of the array, expanding it if necessary. diff --git a/docs/reference/glib/tmpl/caches.sgml b/docs/reference/glib/tmpl/caches.sgml index 119b732f6..33752e5c2 100644 --- a/docs/reference/glib/tmpl/caches.sgml +++ b/docs/reference/glib/tmpl/caches.sgml @@ -51,11 +51,11 @@ called by g_cache_remove() when the object is no longer needed (i.e. its reference count drops to 0). @hash_key_func: a function to create a hash value from a key. @hash_value_func: a function to create a hash value from a value. -@key_compare_func: -@Returns: a new #GCache. - @key_equal_func: a function to compare two keys. It should return TRUE if the two keys are equivalent. +@Returns: a new #GCache. + +@key_compare_func: diff --git a/docs/reference/glib/tmpl/completion.sgml b/docs/reference/glib/tmpl/completion.sgml index 6bb768160..a6b26ced3 100644 --- a/docs/reference/glib/tmpl/completion.sgml +++ b/docs/reference/glib/tmpl/completion.sgml @@ -47,6 +47,7 @@ g_completion_complete(). @func: @prefix: @cache: +@strncmp_func: diff --git a/docs/reference/glib/tmpl/conversions.sgml b/docs/reference/glib/tmpl/conversions.sgml index 1253402d3..5ce913357 100644 --- a/docs/reference/glib/tmpl/conversions.sgml +++ b/docs/reference/glib/tmpl/conversions.sgml @@ -52,15 +52,56 @@ Character Set Conversion + + + + + +@to_codeset: +@from_codeset: +@Returns: + + + + + + + +@converter: +@inbuf: +@inbytes_left: +@outbuf: +@outbytes_left: +@Returns: + + + + + + + +@converter: +@Returns: + + + + + + + +@opsysstring: +@error: +@Returns: + + @opsysstring: -@Returns: - @error: +@Returns: @@ -69,9 +110,18 @@ Character Set Conversion @utf8string: -@Returns: - @error: +@Returns: + + + + + + + +@utf8string: +@error: +@Returns: @@ -82,4 +132,5 @@ Character Set Conversion @G_CONVERT_ERROR_NO_CONVERSION: @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: @G_CONVERT_ERROR_FAILED: +@G_CONVERT_ERROR_PARTIAL_INPUT: diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml index 4f35e5227..60f27af09 100644 --- a/docs/reference/glib/tmpl/date.sgml +++ b/docs/reference/glib/tmpl/date.sgml @@ -422,6 +422,74 @@ dates must be valid. greater than zero if @lhs is greater than @rhs + + +Return the day of the month; the #GDate must be valid. + + +@date: Date to extract the day of the month from +@Returns: Day of the month + + + + +Accessor for the month of the year. Date must be valid. + + +@date: Date to get the month from +@Returns: A #GDateMonth + + + + +Accessor; returns the year of a #GDate. The date must be valid. + + +@date: Date +@Returns: Year in which the date falls + + + + +Accessor, returns the Julian day or "serial number" of the #GDate. The +Julian day is simply the number of days since January 1, Year 1; i.e., +January 1, Year 1 is Julian day 1; January 2, Year 1 is Julian day 2, +etc. Date must be valid. + + +@date: Date to extract the Julian day from +@Returns: Julian day + + + + +Returns the day of the week for a #GDate. The date must be valid. + + +@date: Date +@Returns: Day of the week as a #GDateWeekday + + + + +Return the day of the year, where Jan 1 is the first day of the +year. Date must be valid. + + +@date: Date to extract day of year from +@Returns: Day of the year + + + + +Return the number of days in a month, taking leap years into account. + + +@month: Month +@year: Year +@Returns: Number of days in @month during the year @year. + + Returns TRUE if the date is on the first of a month. Date must be valid. @@ -449,6 +517,56 @@ Returns TRUE if the year is a leap year @Returns: Boolean, if the year is a leap year + + +Return the week of the year, where weeks are understood to start on +Monday. If the date is before the first Monday of the year, return +0. Date must be valid. + + +@date: Date to use +@Returns: Week of the year + + + + +Return the number of weeks in the year, where weeks are taken to start +on Monday. Will be 52 or 53. Date must be valid. (Years always have 52 +7-day periods, plus 1 or 2 extra days depending on whether it's a leap +year. This function is basically telling you how many Mondays are in +the year, i.e. there are 53 Mondays if one of the extra days happens +to be a Monday.) + + +@year: Year +@Returns: Number of Mondays in the year + + + + +Week of the year during which this date falls, if weeks are understood +to being on Sunday. Date must be valid. Can return 0 if the day is +before the first Sunday of the year. + + +@date: Date +@Returns: Week number + + + + +Return the number of weeks in the year, where weeks are taken to start +on Sunday. Will be 52 or 53. Date must be valid. (Years always have 52 +7-day periods, plus 1 or 2 extra days depending on whether it's a leap +year. This function is basically telling you how many Sundays are in +the year, i.e. there are 53 Sundays if one of the extra days happens +to be a Sunday.) + + +@year: Year to count weeks in +@Returns: Number of weeks + + Generate a printed representation of the date, in a locale-specific diff --git a/docs/reference/glib/tmpl/fileutils.sgml b/docs/reference/glib/tmpl/fileutils.sgml index 40b2c3947..a5e903735 100644 --- a/docs/reference/glib/tmpl/fileutils.sgml +++ b/docs/reference/glib/tmpl/fileutils.sgml @@ -93,3 +93,23 @@ File Utilities @Returns: + + + + + +@tmpl: +@Returns: + + + + + + + +@tmpl: +@name_used: +@error: +@Returns: + + diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml index 877be2d3c..087b5a875 100644 --- a/docs/reference/glib/tmpl/glib-unused.sgml +++ b/docs/reference/glib/tmpl/glib-unused.sgml @@ -1,28 +1,3 @@ - - -Return the day of the month; the #GDate must be valid. - - -@date: Date to extract the day of the month from -@Returns: Day of the month - - - - - - -@context: -@text: -@text_len: -@error: -@Returns: - - - - - - - @@ -32,70 +7,12 @@ Return the day of the month; the #GDate must be valid. @callback_data: @callback_funcs: - - -Return the number of weeks in the year, where weeks are taken to start -on Sunday. Will be 52 or 53. Date must be valid. (Years always have 52 -7-day periods, plus 1 or 2 extra days depending on whether it's a leap -year. This function is basically telling you how many Sundays are in -the year, i.e. there are 53 Sundays if one of the extra days happens -to be a Sunday.) - - -@year: Year to count weeks in -@Returns: Number of weeks - - - - - - -@opsysstring: -@error: -@Returns: - - - - - - -@converter: -@Returns: - - - - - - -@source: -@can_recurse: - - - -Return the number of days in a month, taking leap years into account. - - -@month: Month -@year: Year -@Returns: Number of days in @month during the year @year. - - - -Accessor, returns the Julian day or "serial number" of the #GDate. The -Julian day is simply the number of days since January 1, Year 1; i.e., -January 1, Year 1 is Julian day 1; January 2, Year 1 is Julian day 2, -etc. Date must be valid. - - -@date: Date to extract the Julian day from -@Returns: Julian day - @@ -118,131 +35,12 @@ the results may be needed. See #G_PRIORITY_DEFAULT, #G_PRIORITY_DEFAULT_IDLE, #G_PRIORITY_HIGH, #G_PRIORITY_HIGH_IDLE, and #G_PRIORITY_LOW. - - - - - -@G_MARKUP_ERROR_BAD_UTF8: text being parsed was not valid UTF-8 -@G_MARKUP_ERROR_EMPTY: document contained nothing, or only whitespace -@G_MARKUP_ERROR_PARSE: document was ill-formed -@G_MARKUP_ERROR_UNKNOWN_ELEMENT: error should be set by #GMarkupParser functions; element wasn't known -@G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE: error should be set by #GMarkupParser functions; attribute wasn't known -@G_MARKUP_ERROR_INVALID_CONTENT: error should be set by #GMarkupParser functions; something was wrong with contents of the document, e.g. invalid attribute value - - - - - - -@context: -@fd: -@priority: - - - - - - -@init: -@len: -@Returns: - - - - - - -@ref: -@unref: -@get: - - - - - - -@array: -@compare_func: - - - - - - -@context: -@funcs: -@user_data: -@Returns: -@source_data: - - - - - - -@context: - - - - - - - - - - - - -@array: -@compare_func: - - - - - - -@context: -@max_priority: -@timeout: -@fds: -@n_fds: -@Returns: - - - - - - -@to_codeset: -@from_codeset: -@Returns: - - - - - - -@source_funcs: -@struct_size: -@Returns: - - - -Return the week of the year, where weeks are understood to start on -Monday. If the date is before the first Monday of the year, return -0. Date must be valid. - - -@date: Date to use -@Returns: Week of the year - @@ -268,53 +66,19 @@ type of source. - + - +@priority: +@can_recurse: +@funcs: +@source_data: +@user_data: +@notify: +@Returns: @source: -@Returns: - - - -Accessor; returns the year of a #GDate. The date must be valid. - - -@date: Date -@Returns: Year in which the date falls - - - - - - -@tmpl: -@Returns: - - - -Accessor for the month of the year. Date must be valid. - - -@date: Date to get the month from -@Returns: A #GDateMonth - - - - - - @context: -@Returns: - - - - - - -@source: -@fd: @@ -331,163 +95,6 @@ Accessor for the month of the year. Date must be valid. @s2: @Returns: - - - - - -@source: -@timeval: - - - - - - -@context: -@is_running: -@Returns: - - - - - - -@converter: -@inbuf: -@inbytes_left: -@outbuf: -@outbytes_left: -@Returns: - - - - - - -@source: -@Returns: - - - - - - -@array: -@compare_func: - - - -Expands to the proper shared library suffix for the current platform -without the leading dot. For the most Unices and Linux this is "so", -for some HPUX versions this is "sl" and for Windows this is "dll". - - - - - - - - -@context: -@line_number: -@char_number: - - - - - - -@utf8string: -@error: -@Returns: - - - - - - -@loop: -@Returns: - - - - - - -@context: -@fd: - - - - - - -@array: -@compare_func: -@user_data: - - - - - - -@parser: -@flags: -@user_data: -@user_data_dnotify: -@Returns: - - - - - - -@source: -@Returns: - - - - - - -@thread: -@Returns: - - - - - - -@source: -@fd: - - - -Return the day of the year, where Jan 1 is the first day of the -year. Date must be valid. - - -@date: Date to extract day of year from -@Returns: Day of the year - - - - - - -@key_compare_func: -@user_data: -@Returns: - - - - - - -@source: -@Returns: - @@ -498,151 +105,18 @@ year. Date must be valid. @data: @notify: - - - - - -@context: -@may_block: -@Returns: - - - - - - -@context: - - - - - - -@loop: - - - - - - -@context: -@priority: -@Returns: - - - -Week of the year during which this date falls, if weeks are understood -to being on Sunday. Date must be valid. Can return 0 if the day is -before the first Sunday of the year. - - -@date: Date -@Returns: Week number - - - - - - -@source: -@priority: - - - - - - -@array: -@compare_func: -@user_data: - - - - - - -@list: -@compare_func: -@user_data: -@Returns: - - - -Return the number of weeks in the year, where weeks are taken to start -on Monday. Will be 52 or 53. Date must be valid. (Years always have 52 -7-day periods, plus 1 or 2 extra days depending on whether it's a leap -year. This function is basically telling you how many Mondays are in -the year, i.e. there are 53 Mondays if one of the extra days happens -to be a Monday.) - - -@year: Year -@Returns: Number of Mondays in the year - - - - - - -@context: -@user_data: -@Returns: - - - - - - -@context: -@func: - - - -Return a random #gboolean from @rand. This corresponds to a unbiased -coin toss. - - -@rand: a #GRand. -@Returns: a random #gboolean. - - - - - - -@channel: -@condition: -@Returns: - - - - - - -@source: - - - - - - -@context: -@id: -@Returns: - Removes a file descriptor from the list being polled. @@ -656,13 +130,6 @@ Removes a file descriptor from the list being polled. - - - - - -@Returns: - Turns the argument into a string literal by using the '#' stringizing operator. @@ -670,14 +137,6 @@ Turns the argument into a string literal by using the '#' stringizing operator. @x: text to convert to a literal string. - - - - - -@context: -@Returns: - @@ -685,164 +144,12 @@ Turns the argument into a string literal by using the '#' stringizing operator. @Returns: - - - - - -@loop: - - - -Returns the day of the week for a #GDate. The date must be valid. - - -@date: Date -@Returns: Day of the week as a #GDateWeekday - - - - - - -@array: -@compare_func: -@user_data: - - - - - - - - - - - - -@Returns: - - - -There are no flags right now - - -@G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: - - - -Return a random #gboolean. This corresponds to a unbiased coin toss. - - -@Returns: a random #gboolean. - - - - - - -@list: -@compare_func: -@user_data: -@Returns: - - - - - - -@context: -@error: -@Returns: - - - - - - -@source: -@Returns: - - - - - - -@interval: -@Returns: - - - -Any of the fields in #GMarkupParser can be %NULL, in which case they -will be ignored. Except for the @error function, any of these -callbacks can set an error; in particular the -%G_MARKUP_ERROR_UNKNOWN_ELEMENT, %G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, -and %G_MARKUP_ERROR_INVALID_CONTENT errors are intended to be set -from these callbacks. If you set an error from a callback, -g_markup_parse_context_parse() will report that error back to its caller. - - -@start_element: Callback to invoke when the opening tag of an element -is seen. -@end_element: Callback to invoke when the closing tag of an element is seen -@text: Callback to invoke when some text is seen (text is always -inside an element) -@passthrough: Callback to invoke for comments and processing -instructions; if you're re-writing the parsed document, write the -passthrough text back out in the same position -@error: Callback to invoke when an error occurs - - - -Specifies the type of a function used to test two values for -equality. The function should return TRUE if both values are equal and -FALSE otherwise. - - -@a: a value. -@b: a value to compare with. -@Returns: TRUE if @a = @b; FALSE otherwise. - - - - - - -@loop: - - - - - - -@tmpl: -@name_used: -@error: -@Returns: - - - - - - - - - - - - -@context: -@max_priority: -@fds: -@n_fds: -@Returns: - @@ -850,22 +157,6 @@ FALSE otherwise. @Returns: - - - - - -@source: - - - - - - -@text: -@length: -@Returns: - diff --git a/docs/reference/glib/tmpl/hash_tables.sgml b/docs/reference/glib/tmpl/hash_tables.sgml index edbab1812..24d6966ae 100644 --- a/docs/reference/glib/tmpl/hash_tables.sgml +++ b/docs/reference/glib/tmpl/hash_tables.sgml @@ -69,15 +69,15 @@ Hash values are used to determine where keys are stored within the #GHashTable data structure. The g_direct_hash(), g_int_hash() and g_str_hash() functions are provided for some common types of keys. If hash_func is NULL, g_direct_hash() is used. -@key_compare_func: -@Returns: a new #GHashTable. - @key_equal_func: a function to check two keys for equality. This is used when looking up keys in the #GHashTable. The g_direct_equal(), g_int_equal() and g_str_equal() functions are provided for the most common types of keys. If @key_equal_func is NULL, keys are compared directly in a similar fashion to g_direct_equal(), but without the overhead of a function call. +@Returns: a new #GHashTable. + +@key_compare_func: @@ -104,6 +104,18 @@ lookup. @Returns: the hash value corresponding to the key. + + +Specifies the type of a function used to test two values for +equality. The function should return TRUE if both values are equal and +FALSE otherwise. + + +@a: a value. +@b: a value to compare with. +@Returns: TRUE if @a = @b; FALSE otherwise. + + Inserts a new key and value into a #GHashTable. @@ -196,6 +208,7 @@ allocated values are freed yourself. @hash_table: a #GHashTable. @key: the key to remove. +@Returns: diff --git a/docs/reference/glib/tmpl/iochannels.sgml b/docs/reference/glib/tmpl/iochannels.sgml index 1c44eb2ce..ebfdd05e5 100644 --- a/docs/reference/glib/tmpl/iochannels.sgml +++ b/docs/reference/glib/tmpl/iochannels.sgml @@ -209,6 +209,16 @@ Decrements the reference count of a #GIOChannel. @channel: a #GIOChannel. + + + + + +@channel: +@condition: +@Returns: + + Adds the #GIOChannel into the @@ -314,6 +324,6 @@ generic way. @io_write: @io_seek: @io_close: -@io_add_watch: +@io_create_watch: @io_free: diff --git a/docs/reference/glib/tmpl/linked_lists_double.sgml b/docs/reference/glib/tmpl/linked_lists_double.sgml index ab995f073..8812d8a52 100644 --- a/docs/reference/glib/tmpl/linked_lists_double.sgml +++ b/docs/reference/glib/tmpl/linked_lists_double.sgml @@ -268,6 +268,17 @@ value if the first element comes after the second. @Returns: the start of the sorted #GList. + + + + + +@list: +@compare_func: +@user_data: +@Returns: + + Specifies the type of a comparison function used to compare two diff --git a/docs/reference/glib/tmpl/linked_lists_single.sgml b/docs/reference/glib/tmpl/linked_lists_single.sgml index 3bb1a4e0d..780240fcc 100644 --- a/docs/reference/glib/tmpl/linked_lists_single.sgml +++ b/docs/reference/glib/tmpl/linked_lists_single.sgml @@ -271,6 +271,17 @@ value if the first element comes after the second. @Returns: the start of the sorted #GList. + + + + + +@list: +@compare_func: +@user_data: +@Returns: + + Adds the second #GSList onto the end of the first #GSList. diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml index d3feaec8b..dacd838bf 100644 --- a/docs/reference/glib/tmpl/main.sgml +++ b/docs/reference/glib/tmpl/main.sgml @@ -109,7 +109,50 @@ of a GLib or GTK+ application. - + + + + + +@context: +@is_running: +@Returns: + + + + + + + +@loop: + + + + + + + +@loop: + + + + + + + +@loop: + + + + + + + +@loop: +@Returns: + + + Creates a new #GMainLoop for the default main loop. A compatibility macro, see g_main_loop_new(). @@ -120,7 +163,7 @@ very important since calling g_main_run() will set this to TRUE anyway. @Returns: a new #GMainLoop. - + Frees the memory allocated for the #GMainLoop. A compatibility macro, see g_main_loop_destroy(). @@ -129,7 +172,7 @@ g_main_loop_destroy(). @loop: a #GMainLoop. - + Runs a main loop until it stops running. A compatibility macro, see g_main_loop_run(). @@ -137,7 +180,7 @@ Runs a main loop until it stops running. A compatibility macro, see g_main_loop_ @loop: a #GMainLoop. - + Stops the #GMainLoop. If g_main_run() was called to run the #GMainLoop, it will now return. A compatibility macro, see g_main_loop_quit(). @@ -146,7 +189,7 @@ it will now return. A compatibility macro, see g_main_loop_quit(). @loop: a #GMainLoop. - + Checks if the main loop is running. A compatibility macro, see g_main_loop_is_running(). @@ -201,7 +244,40 @@ It is not used within GLib or GTK+. - + + + + + + + + + + + +@thread: +@Returns: + + + + + + + +@Returns: + + + + + + + +@context: +@may_block: +@Returns: + + + Runs a single iteration for the default #GMainContext. A compatibility macro, see g_main_context_iteration(). @@ -214,7 +290,16 @@ processed. @Returns: TRUE if more events are pending. - + + + + + +@context: +@Returns: + + + Checks if any events are pending for the default #GMainContext (i.e. ready to be processed). A compatibility macro, see @@ -224,6 +309,100 @@ g_main_context_pending(). @Returns: %TRUE if any events are pending. + + + + + +@context: +@id: +@Returns: + + + + + + + +@context: +@user_data: +@Returns: + + + + + + + +@context: +@funcs: +@user_data: +@Returns: + +@source_data: + + + + + + + +@context: +@priority: +@Returns: + + + + + + + +@context: +@max_priority: +@timeout: +@fds: +@n_fds: +@Returns: + + + + + + + +@context: +@max_priority: +@fds: +@n_fds: +@Returns: + + + + + + + +@context: + + + + + + + +@context: +@func: + + + + + + + +@context: +@Returns: + + Specifies the type of function passed to g_main_set_poll_func(). @@ -239,7 +418,26 @@ The semantics of the function should match those of the or -1 if an error occurred. - + + + + + +@context: +@fd: +@priority: + + + + + + + +@context: +@fd: + + + Sets the function to use for the handle polling of file descriptors for the default main context. This is a compatability macro, see @@ -249,6 +447,15 @@ g_main_context_set_poll_func() for full details. @func: the function to call to poll all file descriptors. + + + + + +@interval: +@Returns: + + @@ -271,6 +478,14 @@ g_main_context_set_poll_func() for full details. @Returns: + + + + + +@Returns: + + @@ -287,10 +502,10 @@ g_main_context_set_poll_func() for full details. @priority: @function: @data: -@destroy: +@notify: @Returns: -@notify: +@destroy: @@ -336,6 +551,12 @@ poll() function to indicate which events occurred. @events: @revents: + + + + + + The #GSourceFuncs struct contains a table of functions used to handle @@ -416,20 +637,102 @@ the required condition has been met, and returns TRUE if so. @dispatch: @destroy: - + + -@priority: -@can_recurse: -@funcs: -@source_data: -@user_data: -@notify: +@ref: +@unref: +@get: + + + + + + +@source_funcs: +@struct_size: @Returns: - + + + + + + + @source: -@context: +@Returns: + + + + + + + +@source: + + + + + + + +@source: + + + + + + + +@source: +@priority: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@can_recurse: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: + + + + + + + +@source: +@Returns: @@ -443,6 +746,33 @@ of the above functions. @Returns: it should return FALSE if the source should be removed. + + + + + +@source: +@fd: + + + + + + + +@source: +@fd: + + + + + + + +@source: +@timeval: + + diff --git a/docs/reference/glib/tmpl/markup.sgml b/docs/reference/glib/tmpl/markup.sgml index 9c064e3e2..69680e31b 100644 --- a/docs/reference/glib/tmpl/markup.sgml +++ b/docs/reference/glib/tmpl/markup.sgml @@ -87,3 +87,118 @@ Character references + + + + + +@G_MARKUP_ERROR_BAD_UTF8: text being parsed was not valid UTF-8 +@G_MARKUP_ERROR_EMPTY: document contained nothing, or only whitespace +@G_MARKUP_ERROR_PARSE: document was ill-formed +@G_MARKUP_ERROR_UNKNOWN_ELEMENT: error should be set by #GMarkupParser functions; element wasn't known +@G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE: error should be set by #GMarkupParser functions; attribute wasn't known +@G_MARKUP_ERROR_INVALID_CONTENT: error should be set by #GMarkupParser functions; something was wrong with contents of the document, e.g. invalid attribute value + + + + + + + + + + +There are no flags right now + + +@G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: + + + + + + + + + +Any of the fields in #GMarkupParser can be %NULL, in which case they +will be ignored. Except for the @error function, any of these +callbacks can set an error; in particular the +%G_MARKUP_ERROR_UNKNOWN_ELEMENT, %G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, +and %G_MARKUP_ERROR_INVALID_CONTENT errors are intended to be set +from these callbacks. If you set an error from a callback, +g_markup_parse_context_parse() will report that error back to its caller. + + +@start_element: Callback to invoke when the opening tag of an element +is seen. +@end_element: Callback to invoke when the closing tag of an element is seen +@text: Callback to invoke when some text is seen (text is always +inside an element) +@passthrough: Callback to invoke for comments and processing +instructions; if you're re-writing the parsed document, write the +passthrough text back out in the same position +@error: Callback to invoke when an error occurs + + + + + + +@text: +@length: +@Returns: + + + + + + + +@context: +@error: +@Returns: + + + + + + + +@context: + + + + + + + +@context: +@line_number: +@char_number: + + + + + + + +@parser: +@flags: +@user_data: +@user_data_dnotify: +@Returns: + + + + + + + +@context: +@text: +@text_len: +@error: +@Returns: + + diff --git a/docs/reference/glib/tmpl/memory.sgml b/docs/reference/glib/tmpl/memory.sgml index dbab0b586..20e64f2ac 100644 --- a/docs/reference/glib/tmpl/memory.sgml +++ b/docs/reference/glib/tmpl/memory.sgml @@ -27,9 +27,12 @@ The returned pointer is cast to a pointer to the given type. If @count is 0 it returns NULL. +@struct_type: +@n_structs: +@Returns: a pointer to the allocated memory, cast to a pointer to @type. + @type: the type of the elements to allocate. @count: the number of elements to allocate. -@Returns: a pointer to the allocated memory, cast to a pointer to @type. @@ -39,9 +42,12 @@ The returned pointer is cast to a pointer to the given type. If @count is 0 it returns NULL. +@struct_type: +@n_structs: +@Returns: a pointer to the allocated memory, cast to a pointer to @type. + @type: the type of the elements to allocate. @count: the number of elements to allocate. -@Returns: a pointer to the allocated memory, cast to a pointer to @type. @@ -51,10 +57,13 @@ Reallocates the memory pointed to by @mem, so that it now has space for which may have been moved. -@type: the type of the elements to allocate. +@struct_type: @mem: the currently allocated memory. -@count: the number of elements to allocate. +@n_structs: @Returns: a pointer to the new allocated memory, cast to a pointer to @type. + +@type: the type of the elements to allocate. +@count: the number of elements to allocate. @@ -63,8 +72,10 @@ Allocates @size bytes of memory. If @size is 0 it returns NULL. -@size: the number of bytes to allocate. +@n_bytes: @Returns: a pointer to the allocated memory. + +@size: the number of bytes to allocate. @@ -73,8 +84,10 @@ Allocates @size bytes of memory, initialized to 0's. If @size is 0 it returns NULL. -@size: the number of bytes to allocate. +@n_bytes: @Returns: a pointer to the allocated memory. + +@size: the number of bytes to allocate. @@ -85,8 +98,10 @@ have been moved. @mem: the memory to reallocate. -@size: the new size of the allocated memory, in bytes. +@n_bytes: @Returns: the new address of the allocated memory. + +@size: the new size of the allocated memory, in bytes. diff --git a/docs/reference/glib/tmpl/modules.sgml b/docs/reference/glib/tmpl/modules.sgml index 8e5b3498b..0719be68d 100644 --- a/docs/reference/glib/tmpl/modules.sgml +++ b/docs/reference/glib/tmpl/modules.sgml @@ -195,6 +195,15 @@ It is passed the #GModule structure. @module: the module about to be unloaded. + + +Expands to the proper shared library suffix for the current platform +without the leading dot. For the most Unices and Linux this is "so", +for some HPUX versions this is "sl" and for Windows this is "dll". + + + + Used to declare functions exported by modules. diff --git a/docs/reference/glib/tmpl/random_numbers.sgml b/docs/reference/glib/tmpl/random_numbers.sgml index aa91b93b0..745ac8fe5 100644 --- a/docs/reference/glib/tmpl/random_numbers.sgml +++ b/docs/reference/glib/tmpl/random_numbers.sgml @@ -70,6 +70,16 @@ accessed through the g_rand_* functions. @seed: + + +Return a random #gboolean from @rand. This corresponds to a unbiased +coin toss. + + +@rand: a #GRand. +@Returns: a random #gboolean. + + @@ -81,12 +91,12 @@ accessed through the g_rand_* functions. @rand: -@min: -@max: -@Returns: - @begin: @end: +@Returns: + +@min: +@max: @@ -100,12 +110,12 @@ accessed through the g_rand_* functions. @rand: -@min: -@max: -@Returns: - @begin: @end: +@Returns: + +@min: +@max: @@ -114,6 +124,14 @@ accessed through the g_rand_* functions. @seed: + + +Return a random #gboolean. This corresponds to a unbiased coin toss. + + +@Returns: a random #gboolean. + + @@ -123,12 +141,12 @@ accessed through the g_rand_* functions. -@min: -@max: -@Returns: - @begin: @end: +@Returns: + +@min: +@max: @@ -140,11 +158,11 @@ accessed through the g_rand_* functions. -@min: -@max: -@Returns: - @begin: @end: +@Returns: + +@min: +@max: diff --git a/docs/reference/glib/tmpl/relations.sgml b/docs/reference/glib/tmpl/relations.sgml index d6bc52504..5e8318199 100644 --- a/docs/reference/glib/tmpl/relations.sgml +++ b/docs/reference/glib/tmpl/relations.sgml @@ -83,9 +83,9 @@ Note that this must be called before any records are added to the #GRelation. @relation: a #GRelation. @field: the field to index, counting from 0. @hash_func: a function to produce a hash value from the field data. -@key_compare_func: - @key_equal_func: a function to compare two values of the given field. + +@key_compare_func: diff --git a/docs/reference/glib/tmpl/shell.sgml b/docs/reference/glib/tmpl/shell.sgml index 4774574e1..9e8dcdd53 100644 --- a/docs/reference/glib/tmpl/shell.sgml +++ b/docs/reference/glib/tmpl/shell.sgml @@ -36,13 +36,13 @@ Shell-related Utilities @command_line: -@argc: -@argv: +@argcp: +@argvp: @error: @Returns: -@argcp: -@argvp: +@argc: +@argv: diff --git a/docs/reference/glib/tmpl/strings.sgml b/docs/reference/glib/tmpl/strings.sgml index fd4408b5d..23bfc3bc6 100644 --- a/docs/reference/glib/tmpl/strings.sgml +++ b/docs/reference/glib/tmpl/strings.sgml @@ -45,6 +45,16 @@ Creates a new #GString, initialized with the given string. @Returns: the new #GString. + + + + + +@init: +@len: +@Returns: + + Creates a new GString, with enough space for @dfl_size characters. diff --git a/docs/reference/glib/tmpl/trees-binary.sgml b/docs/reference/glib/tmpl/trees-binary.sgml index 104c66ae2..11ab99579 100644 --- a/docs/reference/glib/tmpl/trees-binary.sgml +++ b/docs/reference/glib/tmpl/trees-binary.sgml @@ -61,6 +61,16 @@ second. @Returns: a new #GTree. + + + + + +@key_compare_func: +@user_data: +@Returns: + + Inserts a key/value pair into a #GTree. diff --git a/docs/reference/gobject/tmpl/gobject-unused.sgml b/docs/reference/gobject/tmpl/gobject-unused.sgml index 0cedc322c..10426afd6 100644 --- a/docs/reference/gobject/tmpl/gobject-unused.sgml +++ b/docs/reference/gobject/tmpl/gobject-unused.sgml @@ -1,48 +1,88 @@ - + + + + + +@type: +@iface_type: +@Returns: + + + + + + +@oclass: +@param_id: +@pspec: + + + + + + +@hash_table: +@pspec: +@owner_type: + + - + + + + + +@pspec: +@value: + + + + + + +@instance: +@iface_type: +@Returns: + + + + + + +@object: +@param_name: +@value: + + @plugin: - + -@itype: +@object: +@param_name: +@value: - - - - - + -@plugin_ref: -@plugin_unref: -@complete_type_info: -@complete_interface_info: - - - - - - -@instance: -@signal_id: -@detail: -@closure: -@after: -@Returns: +@object: +@param_id: +@value: +@pspec: +@trailer: @@ -56,28 +96,92 @@ @G_SIGNAL_ACTION: @G_SIGNAL_NO_HOOKS: - + + + + + + + + + + + +@itype: +@struct_offset: +@Returns: + + + + + + +@oclass: +@param_name: +@Returns: + + + + + + +@object: +@param_name: + + + + + + +@instance: +@signal_id: +@detail: +@closure: +@after: +@Returns: + + +gtypemodule.sgml + + + @plugin: -@g_type: -@info: -@value_table: - + +@hash_table: +@param_name: +@owner_type: +@try_ancestors: +@trailer: +@Returns: - + -@plugin: +@object: +@param_id: +@value: +@pspec: +@trailer: + + + + + + +@value: +@type: +@Returns: @@ -95,9 +199,32 @@ @flags: @Returns: - -gtypemodule.sgml + + + + +@plugin: +@g_type: +@info: +@value_table: + + + + + + +@itype: + + + + + + +@plugin_ref: +@plugin_unref: +@complete_type_info: +@complete_interface_info: @@ -109,3 +236,37 @@ gtypemodule.sgml @instance_type: @info: + + + + + + + + + + + +@object: +@param_id: +@pspec: + + + + + + + + + + +@Returns: + + + + + + +@hash_table: +@pspec: + diff --git a/docs/reference/gobject/tmpl/objects.sgml b/docs/reference/gobject/tmpl/objects.sgml index a82953c80..a848bbb9c 100644 --- a/docs/reference/gobject/tmpl/objects.sgml +++ b/docs/reference/gobject/tmpl/objects.sgml @@ -115,37 +115,6 @@ The Base Object Type @class: - - - - - - - - - - - - -@object: -@param_id: -@value: -@pspec: -@trailer: - - - - - - - -@object: -@param_id: -@value: -@pspec: -@trailer: - - @@ -154,35 +123,17 @@ The Base Object Type @object: - - - - - -@oclass: -@param_id: -@pspec: - - - - - - - -@oclass: -@param_name: -@Returns: - - @object_type: -@first_param_name: +@first_property_name: @Varargs: @Returns: + +@first_param_name: @@ -191,9 +142,11 @@ The Base Object Type @object_type: -@first_param_name: +@first_property_name: @var_args: @Returns: + +@first_param_name: @@ -202,8 +155,10 @@ The Base Object Type @object: -@first_param_name: +@first_property_name: @Varargs: + +@first_param_name: @@ -212,8 +167,10 @@ The Base Object Type @object: -@first_param_name: +@first_property_name: @Varargs: + +@first_param_name: @@ -222,8 +179,10 @@ The Base Object Type @object: -@first_param_name: +@first_property_name: @var_args: + +@first_param_name: @@ -232,37 +191,10 @@ The Base Object Type @object: -@first_param_name: +@first_property_name: @var_args: - - - - - - - -@object: -@param_name: -@value: - - - - - - - -@object: -@param_name: -@value: - - - - - - - -@object: -@param_name: + +@first_param_name: @@ -350,13 +282,3 @@ The Base Object Type @Returns: - - - - - -@object: -@param_id: -@pspec: - - diff --git a/docs/reference/gobject/tmpl/param_specs.sgml b/docs/reference/gobject/tmpl/param_specs.sgml index 17ee613bd..bac9490d9 100644 --- a/docs/reference/gobject/tmpl/param_specs.sgml +++ b/docs/reference/gobject/tmpl/param_specs.sgml @@ -19,11 +19,12 @@ Parameter Specifications -@g_instance: +@g_type_instance: @name: @nick: @blurb: @flags: +@value_type: @@ -71,15 +72,6 @@ Parameter Specifications @pspec: - - - - - -@pspec: -@value: - - @@ -103,8 +95,9 @@ Parameter Specifications @G_PARAM_READABLE: @G_PARAM_WRITABLE: -@G_PARAM_MASK: -@G_PARAM_USER_MASK: +@G_PARAM_CONSTRUCT: +@G_PARAM_CONSTRUCT_ONLY: +@G_PARAM_PRIVATE: @@ -217,43 +210,3 @@ Parameter Specifications @Returns: - - - - - -@Returns: - - - - - - - -@hash_table: -@pspec: -@owner_type: - - - - - - - -@hash_table: -@pspec: - - - - - - - -@hash_table: -@param_name: -@owner_type: -@try_ancestors: -@trailer: -@Returns: - - diff --git a/docs/reference/gobject/tmpl/signals.sgml b/docs/reference/gobject/tmpl/signals.sgml index e2afbb4a4..d43a39365 100644 --- a/docs/reference/gobject/tmpl/signals.sgml +++ b/docs/reference/gobject/tmpl/signals.sgml @@ -418,16 +418,6 @@ otherwise. @detail: - - - - - -@itype: -@struct_offset: -@Returns: - - diff --git a/docs/reference/gobject/tmpl/standard_params.sgml b/docs/reference/gobject/tmpl/standard_params.sgml index 763d4473b..f31aa4c4a 100644 --- a/docs/reference/gobject/tmpl/standard_params.sgml +++ b/docs/reference/gobject/tmpl/standard_params.sgml @@ -349,7 +349,6 @@ Standard Parameter Types @parent_instance: -@object_type: diff --git a/docs/reference/gobject/tmpl/types.sgml b/docs/reference/gobject/tmpl/types.sgml index 69bb59382..54cf7df79 100644 --- a/docs/reference/gobject/tmpl/types.sgml +++ b/docs/reference/gobject/tmpl/types.sgml @@ -82,6 +82,7 @@ GType @G_TYPE_PARAM: @G_TYPE_BOXED: @G_TYPE_POINTER: +@G_TYPE_CCALLBACK: @G_TYPE_OBJECT: @G_TYPE_GTK_SIGNAL: @G_TYPE_BSE_PROCEDURE: @@ -102,6 +103,10 @@ GType @G_TYPE_PARAM_FLOAT: @G_TYPE_PARAM_DOUBLE: @G_TYPE_PARAM_STRING: +@G_TYPE_PARAM_PARAM: +@G_TYPE_PARAM_POINTER: +@G_TYPE_PARAM_CCALLBACK: +@G_TYPE_PARAM_BOXED: @G_TYPE_PARAM_OBJECT: @@ -337,16 +342,6 @@ GType @Returns: - - - - - -@type: -@iface_type: -@Returns: - - @@ -606,16 +601,6 @@ GType @Returns: - - - - - -@instance: -@iface_type: -@Returns: - - @@ -713,13 +698,3 @@ GType @Returns: - - - - - -@value: -@type: -@Returns: - -