luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct source and destination charset parameter order in g_convert()

Browse Source 
2004-08-19  Tor Lillqvist  <tml@iki.fi>

	* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
	source and destination charset parameter order in g_convert()
	call. (#150394, possibly also #141124)
This commit is contained in:
Tor Lillqvist 2004-08-19 23:30:17 +00:00 committed by Tor Lillqvist
parent 9758c34d4c
commit 2a7bfb4ee4
6 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
source and destination charset parameter order in g_convert()
call. (#150394, possibly also #141124)
2004-08-16 Christian Rose <menthos@menthos.com> 2004-08-16 Christian Rose <menthos@menthos.com>
* configure.in: Added "bs" to ALL_LINGUAS. * configure.in: Added "bs" to ALL_LINGUAS.

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
source and destination charset parameter order in g_convert()
call. (#150394, possibly also #141124)
2004-08-16 Christian Rose <menthos@menthos.com> 2004-08-16 Christian Rose <menthos@menthos.com>
* configure.in: Added "bs" to ALL_LINGUAS. * configure.in: Added "bs" to ALL_LINGUAS.

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
source and destination charset parameter order in g_convert()
call. (#150394, possibly also #141124)
2004-08-16 Christian Rose <menthos@menthos.com> 2004-08-16 Christian Rose <menthos@menthos.com>
* configure.in: Added "bs" to ALL_LINGUAS. * configure.in: Added "bs" to ALL_LINGUAS.

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
source and destination charset parameter order in g_convert()
call. (#150394, possibly also #141124)
2004-08-16 Christian Rose <menthos@menthos.com> 2004-08-16 Christian Rose <menthos@menthos.com>
* configure.in: Added "bs" to ALL_LINGUAS. * configure.in: Added "bs" to ALL_LINGUAS.

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2004-08-19 Tor Lillqvist <tml@iki.fi>
* glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): Correct
source and destination charset parameter order in g_convert()
call. (#150394, possibly also #141124)
2004-08-16 Christian Rose <menthos@menthos.com> 2004-08-16 Christian Rose <menthos@menthos.com>
* configure.in: Added "bs" to ALL_LINGUAS. * configure.in: Added "bs" to ALL_LINGUAS.

6
glib/gunicollate.c
View File

@ -84,8 +84,8 @@ g_utf8_collate (const gchar *str1,
} }
else else
{ {
gchar *str1_locale = g_convert (str1_norm, -1, "UTF-8", charset, NULL, NULL, NULL); gchar *str1_locale = g_convert (str1_norm, -1, charset, "UTF-8", NULL, NULL, NULL);
gchar *str2_locale = g_convert (str2_norm, -1, "UTF-8", charset, NULL, NULL, NULL); gchar *str2_locale = g_convert (str2_norm, -1, charset, "UTF-8", NULL, NULL, NULL);
if (str1_locale && str2_locale) if (str1_locale && str2_locale)
result = strcoll (str1_locale, str2_locale); result = strcoll (str1_locale, str2_locale);
@ -226,7 +226,7 @@ g_utf8_collate_key (const gchar *str,
} }
else else
{ {
gchar *str_locale = g_convert (str_norm, -1, "UTF-8", charset, NULL, NULL, NULL); gchar *str_locale = g_convert (str_norm, -1, charset, "UTF-8", NULL, NULL, NULL);
if (str_locale) if (str_locale)
{ {