From 0030936be908f7e311203fc57db55a52d755f539 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 20 Jan 2001 22:26:32 +0000 Subject: [PATCH] Even if g_get_codeset() is currently commented out from gutils.h, fix it 2001-01-20 Tor Lillqvist * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is currently commented out from gutils.h, fix it to return the same CP%d value as g_get_charset(). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gutils.c | 6 +----- gutils.c | 6 +----- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e822ef..aa0d3eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6e822ef..aa0d3eb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-01-20 Tor Lillqvist + + * gutils.c (g_get_codeset): (Win32) Even if g_get_codeset() is + currently commented out from gutils.h, fix it to return the same + CP%d value as g_get_charset(). + 2001-01-19 Kjartan Maraas * gconvert.c: Fix typo. diff --git a/glib/gutils.c b/glib/gutils.c index c48fb2d..61cdcf5 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -69,7 +69,6 @@ # include # include # include -# include #endif /* G_OS_WIN32 */ #ifdef HAVE_CODESET @@ -994,10 +993,7 @@ g_get_codeset (void) */ return g_strdup ("ISO-8859-1"); #else - /* On Win32 we always use UTF-8. At least in GDK. SO should we - * therefore return that? - */ - return g_strdup ("UTF-8"); + return g_strdup_printf ("CP%d", GetACP ()); #endif #endif } diff --git a/gutils.c b/gutils.c index c48fb2d..61cdcf5 100644 --- a/gutils.c +++ b/gutils.c @@ -69,7 +69,6 @@ # include # include # include -# include #endif /* G_OS_WIN32 */ #ifdef HAVE_CODESET @@ -994,10 +993,7 @@ g_get_codeset (void) */ return g_strdup ("ISO-8859-1"); #else - /* On Win32 we always use UTF-8. At least in GDK. SO should we - * therefore return that? - */ - return g_strdup ("UTF-8"); + return g_strdup_printf ("CP%d", GetACP ()); #endif #endif } -- 2.7.4