luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge from 2.4:

Browse Source 
Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>

	Merge from 2.4:

	* glib/gutils.h: Remove vestigial g_get_codeset().
	* glib/gutils.c (g_get_codeset): Call g_get_charset().
This commit is contained in:
Matthias Clasen 2004-05-09 03:08:19 +00:00 committed by Matthias Clasen
parent b745e58abc
commit 1d4458c448
7 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat May 8 23:02:26 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* glib/gutils.h: Remove vestigial g_get_codeset().
* glib/gutils.c (g_get_codeset): Call g_get_charset().
2004-05-06 Matthias Clasen <mclasen@redhat.com> 2004-05-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version number to 2.5.0. * configure.in: Bump version number to 2.5.0.

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Sat May 8 23:02:26 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* glib/gutils.h: Remove vestigial g_get_codeset().
* glib/gutils.c (g_get_codeset): Call g_get_charset().
2004-05-06 Matthias Clasen <mclasen@redhat.com> 2004-05-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version number to 2.5.0. * configure.in: Bump version number to 2.5.0.

7
ChangeLog.pre-2-12
View File

@ -1,3 +1,10 @@
Sat May 8 23:02:26 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* glib/gutils.h: Remove vestigial g_get_codeset().
* glib/gutils.c (g_get_codeset): Call g_get_charset().
2004-05-06 Matthias Clasen <mclasen@redhat.com> 2004-05-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version number to 2.5.0. * configure.in: Bump version number to 2.5.0.

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Sat May 8 23:02:26 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* glib/gutils.h: Remove vestigial g_get_codeset().
* glib/gutils.c (g_get_codeset): Call g_get_charset().
2004-05-06 Matthias Clasen <mclasen@redhat.com> 2004-05-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version number to 2.5.0. * configure.in: Bump version number to 2.5.0.

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Sat May 8 23:02:26 2004 Matthias Clasen <maclas@gmx.de>
Merge from 2.4:
* glib/gutils.h: Remove vestigial g_get_codeset().
* glib/gutils.c (g_get_codeset): Call g_get_charset().
2004-05-06 Matthias Clasen <mclasen@redhat.com> 2004-05-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version number to 2.5.0. * configure.in: Bump version number to 2.5.0.

17
glib/gutils.c
View File

@ -1230,18 +1230,11 @@ g_nullify_pointer (gpointer *nullify_location)
gchar * gchar *
g_get_codeset (void) g_get_codeset (void)
{ {
#ifdef HAVE_CODESET gchar *charset;
char *result = nl_langinfo (CODESET);
return g_strdup (result); g_get_charset (&charset);
#else
#ifdef G_PLATFORM_WIN32 return charset;
return g_strdup_printf ("CP%d", GetACP ());
#else
/* FIXME: Do something more intelligent based on setlocale (LC_CTYPE, NULL)
*/
return g_strdup ("ISO-8859-1");
#endif
#endif
} }
#ifdef ENABLE_NLS #ifdef ENABLE_NLS

3
glib/gutils.h
View File

@ -171,9 +171,6 @@ gchar* g_path_get_dirname (const gchar *file_name);
/* Set the pointer at the specified location to NULL */ /* Set the pointer at the specified location to NULL */
void g_nullify_pointer (gpointer *nullify_location); void g_nullify_pointer (gpointer *nullify_location);
/* Get the codeset for the current locale */
/* gchar * g_get_codeset (void); */
/* return the environment string for the variable. The returned memory /* return the environment string for the variable. The returned memory
* must not be freed. */ * must not be freed. */
G_CONST_RETURN gchar* g_getenv (const gchar *variable); G_CONST_RETURN gchar* g_getenv (const gchar *variable);