luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Even if g_get_codeset() is currently commented out from gutils.h, fix it

Browse Source 
2001-01-20  Tor Lillqvist  <tml@iki.fi>

	* 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().
This commit is contained in:
Tor Lillqvist 2001-01-20 22:26:32 +00:00 committed by Tor Lillqvist
parent 59ce63340a
commit 0030936be9
10 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2001-01-20 Tor Lillqvist <tml@iki.fi>
* 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 <kmaraas@gnome.org>
* gconvert.c: Fix typo.

6
glib/gutils.c
View File

@ -69,7 +69,6 @@
# include <windows.h>
# include <ctype.h>
# include <direct.h>
# include <io.h>
#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
}

6
gutils.c
View File

@ -69,7 +69,6 @@
# include <windows.h>
# include <ctype.h>
# include <direct.h>
# include <io.h>
#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
}