gconvert.h   gconvert.h 
skipping to change at line 38 skipping to change at line 38
#error "Only <glib.h> can be included directly." #error "Only <glib.h> can be included directly."
#endif #endif
#ifndef __G_CONVERT_H__ #ifndef __G_CONVERT_H__
#define __G_CONVERT_H__ #define __G_CONVERT_H__
#include <glib/gerror.h> #include <glib/gerror.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/**
* GConvertError:
* @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested charact
er
* sets is not supported.
* @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion i
nput.
* @G_CONVERT_ERROR_FAILED: Conversion failed for some reason.
* @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of inp
ut.
* @G_CONVERT_ERROR_BAD_URI: URI is invalid.
* @G_CONVERT_ERROR_NOT_ABSOLUTE_PATH: Pathname is not an absolute path.
*
* Error codes returned by character set conversion routines.
*/
typedef enum typedef enum
{ {
G_CONVERT_ERROR_NO_CONVERSION, G_CONVERT_ERROR_NO_CONVERSION,
G_CONVERT_ERROR_ILLEGAL_SEQUENCE, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
G_CONVERT_ERROR_FAILED, G_CONVERT_ERROR_FAILED,
G_CONVERT_ERROR_PARTIAL_INPUT, G_CONVERT_ERROR_PARTIAL_INPUT,
G_CONVERT_ERROR_BAD_URI, G_CONVERT_ERROR_BAD_URI,
G_CONVERT_ERROR_NOT_ABSOLUTE_PATH G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
} GConvertError; } GConvertError;
/**
* G_CONVERT_ERROR:
*
* Error domain for character set conversions. Errors in this domain will
* be from the #GConvertError enumeration. See #GError for information on
* error domains.
*/
#define G_CONVERT_ERROR g_convert_error_quark() #define G_CONVERT_ERROR g_convert_error_quark()
GQuark g_convert_error_quark (void); GQuark g_convert_error_quark (void);
/* Thin wrappers around iconv /**
* GIconv:
*
* The <structname>GIConv</structname> struct wraps an
* iconv() conversion descriptor. It contains private data
* and should only be accessed using the following functions.
*/ */
typedef struct _GIConv *GIConv; typedef struct _GIConv *GIConv;
GIConv g_iconv_open (const gchar *to_codeset, GIConv g_iconv_open (const gchar *to_codeset,
const gchar *from_codeset); const gchar *from_codeset);
gsize g_iconv (GIConv converter, gsize g_iconv (GIConv converter,
gchar **inbuf, gchar **inbuf,
gsize *inbytes_left, gsize *inbytes_left,
gchar **outbuf, gchar **outbuf,
gsize *outbytes_left); gsize *outbytes_left);
skipping to change at line 102 skipping to change at line 126
GError **error) G_GNUC_MALLOC; GError **error) G_GNUC_MALLOC;
gchar* g_locale_from_utf8 (const gchar *utf8string, gchar* g_locale_from_utf8 (const gchar *utf8string,
gssize len, gssize len,
gsize *bytes_read, gsize *bytes_read,
gsize *bytes_written, gsize *bytes_written,
GError **error) G_GNUC_MALLOC; GError **error) G_GNUC_MALLOC;
/* Convert between the operating system (or C runtime) /* Convert between the operating system (or C runtime)
* representation of file names and UTF-8. * representation of file names and UTF-8.
*/ */
#ifndef __GTK_DOC_IGNORE__
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define g_filename_to_utf8 g_filename_to_utf8_utf8 #define g_filename_to_utf8 g_filename_to_utf8_utf8
#define g_filename_from_utf8 g_filename_from_utf8_utf8 #define g_filename_from_utf8 g_filename_from_utf8_utf8
#define g_filename_from_uri g_filename_from_uri_utf8 #define g_filename_from_uri g_filename_from_uri_utf8
#define g_filename_to_uri g_filename_to_uri_utf8 #define g_filename_to_uri g_filename_to_uri_utf8
#endif #endif
#endif
gchar* g_filename_to_utf8 (const gchar *opsysstring, gchar* g_filename_to_utf8 (const gchar *opsysstring,
gssize len, gssize len,
gsize *bytes_read, gsize *bytes_read,
gsize *bytes_written, gsize *bytes_written,
GError **error) G_GNUC_MALLOC; GError **error) G_GNUC_MALLOC;
gchar* g_filename_from_utf8 (const gchar *utf8string, gchar* g_filename_from_utf8 (const gchar *utf8string,
gssize len, gssize len,
gsize *bytes_read, gsize *bytes_read,
gsize *bytes_written, gsize *bytes_written,
 End of changes. 5 change blocks. 
1 lines changed or deleted 30 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/