Bumped the version number to 0.111.99.1 for new e_utf8 functions.

2001-09-01  Christopher James Lahey  <clahey@ximian.com>

	* configure.in: Bumped the version number to 0.111.99.1 for new
	e_utf8 functions.

	* gal/unicode/gunicollate.c (g_utf8_collate, g_utf8_collate_key):
	Changed this from e_utf8_from_locale_string to
	e_utf8_to_locale_string.

	* gal/widgets/e-font.c, gal/widgets/e-font.h
	(e_iconv_from_charset, e_iconv_to_charset): Added these functions
	to the exported interface (renamed them as well from
	e_iconv_from_encoding and e_iconv_to_encoding.)

	* gal/widgets/e-unicode.c, gal/widgets/e-unicode.h
	(e_utf8_from_iconv_string, e_utf8_from_iconv_string_sized,
	e_utf8_to_iconv_string, e_utf8_to_iconv_string_sized,
	e_utf8_from_charset_string, e_utf8_from_charset_string_sized,
	e_utf8_to_charset_string, e_utf8_to_charset_string_sized): Added
	these functions.
	(e_utf8_from_locale_string, e_utf8_to_locale_string): Changed
	these to use the new e_utf8_from_iconv_string and
	e_utf8_to_iconv_string.

svn path=/trunk/; revision=12554

1 files changed, 16 insertions, 0 deletions

diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h
index 019505948f..0b137dc200 100644
--- a/widgets/misc/e-unicode.h
+++ b/widgets/misc/e-unicode.h
@@ -20,6 +20,7 @@
 #include <libgnome/gnome-defs.h>
 #include <gnome-xml/tree.h>
 #include <gal/unicode/gunicode.h>
+#include <iconv.h>
 
 BEGIN_GNOME_DECLS
 
@@ -39,12 +40,27 @@ const gchar *e_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle
 
 gchar *e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string);
 
+gchar *e_utf8_from_iconv_string (iconv_t ic, const gchar *string);
+gchar *e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes);
+
+gchar *e_utf8_to_iconv_string (iconv_t ic, const gchar *string);
+gchar *e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes);
+
+
+gchar *e_utf8_from_charset_string (const gchar *charset, const gchar *string);
+gchar *e_utf8_from_charset_string_sized (const gchar *charset, const gchar *string, gint bytes);
+
+gchar *e_utf8_to_charset_string (const gchar *charset, const gchar *string);
+gchar *e_utf8_to_charset_string_sized (const gchar *charset, const gchar *string, gint bytes);
+
+
 gchar *e_utf8_from_gtk_string (GtkWidget *widget, const gchar *string);
 gchar *e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes);
 
 gchar *e_utf8_to_gtk_string (GtkWidget *widget, const gchar *string);
 gchar *e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes);
 
+
 gchar *e_utf8_from_locale_string (const gchar *string);
 gchar *e_utf8_from_locale_string_sized (const gchar *string, gint bytes);