diff --git a/ChangeLog b/ChangeLog index 83e4968d1..7268578db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 83e4968d1..7268578db 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 83e4968d1..7268578db 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 83e4968d1..7268578db 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 83e4968d1..7268578db 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 83e4968d1..7268578db 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 83e4968d1..7268578db 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-12-03 Frederic Crozat + + * glib/gunicollate.c: (g_utf8_collate_key): + Fix typo from previous commit + Tue Dec 3 01:05:00 2002 James M. Cape * glib/gunicollate.c (g_utf8_collate, g_utf8_collate_key): diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 3cd691108..c33a70dd7 100644 --- a/glib/gunicollate.c +++ b/glib/gunicollate.c @@ -186,7 +186,7 @@ g_utf8_collate_key (const gchar *str, size_t i; size_t result_len = 0; - g_return_val_if_fail (str1 != NULL, NULL); + g_return_val_if_fail (str != NULL, NULL); str_norm = _g_utf8_normalize_wc (str, len, G_NORMALIZE_ALL_COMPOSE);