From 9f13de7e04dec6e4c1ea67261d251dab46179e79 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Mar 2004 23:45:04 +0000 Subject: [PATCH] Use case-insensitive comparison. Fixes XIM module loading on AIX. Tue Mar 2 00:47:21 2004 Matthias Clasen * gtk/gtkimmodule.c (match_locale): Use case-insensitive comparison. Fixes XIM module loading on AIX. (#131277) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkimmodule.c | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0eab7c039f..a013c53078 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 2 00:47:21 2004 Matthias Clasen + + * gtk/gtkimmodule.c (match_locale): Use case-insensitive + comparison. Fixes XIM module loading on AIX. (#131277) + Mon Mar 1 23:59:18 2004 Matthias Clasen * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0eab7c039f..a013c53078 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Mar 2 00:47:21 2004 Matthias Clasen + + * gtk/gtkimmodule.c (match_locale): Use case-insensitive + comparison. Fixes XIM module loading on AIX. (#131277) + Mon Mar 1 23:59:18 2004 Matthias Clasen * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0eab7c039f..a013c53078 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Mar 2 00:47:21 2004 Matthias Clasen + + * gtk/gtkimmodule.c (match_locale): Use case-insensitive + comparison. Fixes XIM module loading on AIX. (#131277) + Mon Mar 1 23:59:18 2004 Matthias Clasen * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0eab7c039f..a013c53078 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Mar 2 00:47:21 2004 Matthias Clasen + + * gtk/gtkimmodule.c (match_locale): Use case-insensitive + comparison. Fixes XIM module loading on AIX. (#131277) + Mon Mar 1 23:59:18 2004 Matthias Clasen * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0eab7c039f..a013c53078 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Mar 2 00:47:21 2004 Matthias Clasen + + * gtk/gtkimmodule.c (match_locale): Use case-insensitive + comparison. Fixes XIM module loading on AIX. (#131277) + Mon Mar 1 23:59:18 2004 Matthias Clasen * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index c68644332f..90f3f94682 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -517,10 +517,10 @@ match_locale (const gchar *locale, if (strcmp (against, "*") == 0) return 1; - if (strcmp (locale, against) == 0) + if (g_ascii_strcasecmp (locale, against) == 0) return 4; - if (strncmp (locale, against, 2) == 0) + if (g_ascii_strncasecmp (locale, against, 2) == 0) return (against_len == 2) ? 3 : 2; return 0;