+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>
* configure.in: Bump version number to 2.5.0.
+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>
* configure.in: Bump version number to 2.5.0.
+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>
* configure.in: Bump version number to 2.5.0.
+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>
* configure.in: Bump version number to 2.5.0.
+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>
* configure.in: Bump version number to 2.5.0.
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
/* 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);