From 8eb6625370dfbead0fce329355bd07732d0eeda9 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 13 Nov 2000 18:59:45 +0000 Subject: [PATCH] Move conversion functions into GConv section. Mon Nov 13 00:18:55 2000 Owen Taylor * glib/glib-sections.sgml: Move conversion functions into GConv section. * gobject/gobject-docs.sgml: Fix some malformed sgml. --- docs/reference/ChangeLog | 7 +++ docs/reference/glib/glib-sections.txt | 10 +++- docs/reference/glib/tmpl/conversions.sgml | 73 +++++++++++++++++++++++ docs/reference/glib/tmpl/fileutils.sgml | 11 ++++ docs/reference/glib/tmpl/misc_utils.sgml | 18 ------ docs/reference/gobject/gobject-docs.sgml | 1 - 6 files changed, 99 insertions(+), 21 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index b13c1ddb..dbb12e7e 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 13 00:18:55 2000 Owen Taylor + + * glib/glib-sections.sgml: Move conversion functions + into GConv section. + + * gobject/gobject-docs.sgml: Fix some malformed sgml. + Sun Nov 5 13:24:50 2000 Owen Taylor * gobject/Makefile.am gobject/gobject-sections.sgml: Updates diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index c6c718d3..da7b1d49 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -736,6 +736,7 @@ g_file_error_from_errno g_file_get_contents g_file_test g_mkstemp +g_file_open_tmp g_file_error_quark @@ -950,8 +951,6 @@ g_path_is_absolute g_path_skip_root g_path_get_basename g_path_get_dirname -g_filename_to_utf8 -g_filename_from_utf8 g_find_program_in_path @@ -1597,6 +1596,13 @@ g_random_double_range g_convert g_convert_with_fallback G_CONVERT_ERROR +g_iconv_open +g_iconv +g_iconv_close +g_locale_to_utf8 +g_filename_to_utf8 +g_filename_from_utf8 +g_locale_from_utf8 GConvertError g_convert_error_quark diff --git a/docs/reference/glib/tmpl/conversions.sgml b/docs/reference/glib/tmpl/conversions.sgml index e30a5dc0..5ce91335 100644 --- a/docs/reference/glib/tmpl/conversions.sgml +++ b/docs/reference/glib/tmpl/conversions.sgml @@ -52,6 +52,78 @@ Character Set Conversion + + + + + +@to_codeset: +@from_codeset: +@Returns: + + + + + + + +@converter: +@inbuf: +@inbytes_left: +@outbuf: +@outbytes_left: +@Returns: + + + + + + + +@converter: +@Returns: + + + + + + + +@opsysstring: +@error: +@Returns: + + + + + + + +@opsysstring: +@error: +@Returns: + + + + + + + +@utf8string: +@error: +@Returns: + + + + + + + +@utf8string: +@error: +@Returns: + + @@ -60,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/fileutils.sgml b/docs/reference/glib/tmpl/fileutils.sgml index bc1db140..a5e90373 100644 --- a/docs/reference/glib/tmpl/fileutils.sgml +++ b/docs/reference/glib/tmpl/fileutils.sgml @@ -102,3 +102,14 @@ File Utilities @Returns: + + + + + +@tmpl: +@name_used: +@error: +@Returns: + + diff --git a/docs/reference/glib/tmpl/misc_utils.sgml b/docs/reference/glib/tmpl/misc_utils.sgml index e15bfb47..545da9cf 100644 --- a/docs/reference/glib/tmpl/misc_utils.sgml +++ b/docs/reference/glib/tmpl/misc_utils.sgml @@ -170,24 +170,6 @@ freed when no longer needed. @Returns: the directory components of the file. - - - - - -@opsysstring: -@Returns: - - - - - - - -@utf8string: -@Returns: - - diff --git a/docs/reference/gobject/gobject-docs.sgml b/docs/reference/gobject/gobject-docs.sgml index 9e25169e..bc9def64 100644 --- a/docs/reference/gobject/gobject-docs.sgml +++ b/docs/reference/gobject/gobject-docs.sgml @@ -58,7 +58,6 @@ fundamental types that can be used to generically handle object properties or otherwise parameterized types. - -- 2.34.1