Commit f5eb6acc authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some point.

2004-04-23  Matthias Clasen  <mclasen@redhat.com>

	* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
	Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
	point.  (#139134, Piotr Klaban)
parent b26e8861
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban)
......
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban)
......
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban)
......
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban)
......
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban)
......
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban)
......
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/running.sgml: Document LIBCHARSET_ALIAS_DIR.
2004-04-15 Matthias Clasen <mclasen@redhat.com>
* glib/tmpl/types.sgml: Correct the description of the
......
......@@ -86,6 +86,17 @@ variables like <envar>LANG</envar>, <envar>PATH</envar> or <envar>HOME</envar>.
</para>
</formalpara>
<formalpara>
<title><envar>LIBCHARSET_ALIAS_DIR</envar></title>
<para>
Allows to specify a nonstandard location for the
<filename>charset.aliases</filename> file that is used by the
character set conversion routines. The default location is the
<replaceable>libdir</replaceable> specified at compilation time.
</para>
</formalpara>
</refsect2>
<refsect2>
......
......@@ -119,10 +119,13 @@ _g_locale_get_charset_aliases ()
{
#if !defined WIN32
FILE *fp;
const char *dir = LIBDIR;
const char *dir = getenv ("LIBCHARSET_ALIAS_DIR");
const char *base = "charset.alias";
char *file_name;
if (dir == NULL)
dir = LIBDIR;
/* Concatenate dir and base into freshly allocated file_name. */
{
size_t dir_len = strlen (dir);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment