From c61e425b91836146cfc3b300ecc237493fa4a48e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 19 Aug 2004 23:38:38 +0000 Subject: [PATCH] Correct source and destination charset parameter order in g_convert() 2004-08-19 Tor Lillqvist * 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) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gunicollate.c | 6 +++--- 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5beac52..5d82166 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-08-19 Tor Lillqvist + + * 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-20 Jon K Hellan * glib/goption.h: Remove trailing commas. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5beac52..5d82166 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-08-19 Tor Lillqvist + + * 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-20 Jon K Hellan * glib/goption.h: Remove trailing commas. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5beac52..5d82166 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2004-08-19 Tor Lillqvist + + * 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-20 Jon K Hellan * glib/goption.h: Remove trailing commas. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5beac52..5d82166 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-08-19 Tor Lillqvist + + * 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-20 Jon K Hellan * glib/goption.h: Remove trailing commas. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5beac52..5d82166 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-08-19 Tor Lillqvist + + * 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-20 Jon K Hellan * glib/goption.h: Remove trailing commas. diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 63dc730..9ca3a58 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -84,8 +84,8 @@ g_utf8_collate (const gchar *str1, } else { - gchar *str1_locale = g_convert (str1_norm, -1, "UTF-8", charset, NULL, NULL, NULL); - gchar *str2_locale = g_convert (str2_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, charset, "UTF-8", NULL, NULL, NULL); if (str1_locale && str2_locale) result = strcoll (str1_locale, str2_locale); @@ -226,7 +226,7 @@ g_utf8_collate_key (const gchar *str, } 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) { -- 2.7.4