From a302a5ea5bf07de7b3a1d4e89f11624c02db7c9d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 29 Mar 2002 23:15:03 +0000 Subject: [PATCH] Call gdk_keyval_to_lower() on the key passed in, since we lowercase all Fri Mar 29 18:09:18 2002 Owen Taylor * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call gdk_keyval_to_lower() on the key passed in, since we lowercase all other key vals passed in, so querying keyvals will otherwise fail if the caller used an uppercase accelerators (#76899, Vitaly Tishkov) --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtkaccelgroup.c | 2 +- 7 files changed, 49 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2bfbfff221..a90b6b16af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Mar 29 18:09:18 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call + gdk_keyval_to_lower() on the key passed in, since we + lowercase all other key vals passed in, so querying + keyvals will otherwise fail if the caller used + an uppercase accelerators (#76899, Vitaly Tishkov) + Fri Mar 29 17:41:21 2002 Owen Taylor * gtk/gtkmain.c (load_modules): Fix screwup in handling diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2bfbfff221..a90b6b16af 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Mar 29 18:09:18 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call + gdk_keyval_to_lower() on the key passed in, since we + lowercase all other key vals passed in, so querying + keyvals will otherwise fail if the caller used + an uppercase accelerators (#76899, Vitaly Tishkov) + Fri Mar 29 17:41:21 2002 Owen Taylor * gtk/gtkmain.c (load_modules): Fix screwup in handling diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2bfbfff221..a90b6b16af 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Mar 29 18:09:18 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call + gdk_keyval_to_lower() on the key passed in, since we + lowercase all other key vals passed in, so querying + keyvals will otherwise fail if the caller used + an uppercase accelerators (#76899, Vitaly Tishkov) + Fri Mar 29 17:41:21 2002 Owen Taylor * gtk/gtkmain.c (load_modules): Fix screwup in handling diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2bfbfff221..a90b6b16af 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Mar 29 18:09:18 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call + gdk_keyval_to_lower() on the key passed in, since we + lowercase all other key vals passed in, so querying + keyvals will otherwise fail if the caller used + an uppercase accelerators (#76899, Vitaly Tishkov) + Fri Mar 29 17:41:21 2002 Owen Taylor * gtk/gtkmain.c (load_modules): Fix screwup in handling diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2bfbfff221..a90b6b16af 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Mar 29 18:09:18 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call + gdk_keyval_to_lower() on the key passed in, since we + lowercase all other key vals passed in, so querying + keyvals will otherwise fail if the caller used + an uppercase accelerators (#76899, Vitaly Tishkov) + Fri Mar 29 17:41:21 2002 Owen Taylor * gtk/gtkmain.c (load_modules): Fix screwup in handling diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2bfbfff221..a90b6b16af 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Mar 29 18:09:18 2002 Owen Taylor + + * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call + gdk_keyval_to_lower() on the key passed in, since we + lowercase all other key vals passed in, so querying + keyvals will otherwise fail if the caller used + an uppercase accelerators (#76899, Vitaly Tishkov) + Fri Mar 29 17:41:21 2002 Owen Taylor * gtk/gtkmain.c (load_modules): Fix screwup in handling diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 1b95325e36..4cf27e5c9b 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -695,7 +695,7 @@ gtk_accel_group_query (GtkAccelGroup *accel_group, g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), NULL); - entries = quick_accel_find (accel_group, accel_key, accel_mods, &n); + entries = quick_accel_find (accel_group, gdk_keyval_to_lower (accel_key), accel_mods, &n); if (n_entries) *n_entries = entries ? n : 0;