From 1d4458c4484a28fcb1e2eda2e4b85c4f38066d41 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 9 May 2004 03:08:19 +0000 Subject: [PATCH] Merge from 2.4: Sat May 8 23:02:26 2004 Matthias Clasen Merge from 2.4: * glib/gutils.h: Remove vestigial g_get_codeset(). * glib/gutils.c (g_get_codeset): Call g_get_charset(). --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/gutils.c | 17 +++++------------ glib/gutils.h | 3 --- 7 files changed, 40 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5918b9..c4e4603 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat May 8 23:02:26 2004 Matthias Clasen + + 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 * configure.in: Bump version number to 2.5.0. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e5918b9..c4e4603 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sat May 8 23:02:26 2004 Matthias Clasen + + 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 * configure.in: Bump version number to 2.5.0. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index e5918b9..c4e4603 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Sat May 8 23:02:26 2004 Matthias Clasen + + 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 * configure.in: Bump version number to 2.5.0. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e5918b9..c4e4603 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sat May 8 23:02:26 2004 Matthias Clasen + + 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 * configure.in: Bump version number to 2.5.0. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e5918b9..c4e4603 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sat May 8 23:02:26 2004 Matthias Clasen + + 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 * configure.in: Bump version number to 2.5.0. diff --git a/glib/gutils.c b/glib/gutils.c index 98c952c..90e83d3 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1230,18 +1230,11 @@ g_nullify_pointer (gpointer *nullify_location) gchar * g_get_codeset (void) { -#ifdef HAVE_CODESET - char *result = nl_langinfo (CODESET); - return g_strdup (result); -#else -#ifdef G_PLATFORM_WIN32 - 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 + gchar *charset; + + g_get_charset (&charset); + + return charset; } #ifdef ENABLE_NLS diff --git a/glib/gutils.h b/glib/gutils.h index c5c1300..731cf1e 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -171,9 +171,6 @@ gchar* g_path_get_dirname (const gchar *file_name); /* Set the pointer at the specified location to NULL */ 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 * must not be freed. */ G_CONST_RETURN gchar* g_getenv (const gchar *variable); -- 2.7.4