From 03a160119081da763f4f631bbf05d87be23dbe74 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 28 Jan 2002 07:43:26 +0000 Subject: [PATCH] & with the default mod mask so accels work when numlock is on. 2002-01-28 Anders Carlsson * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the default mod mask so accels work when numlock is on. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkaccelgroup.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2cb79045cb..1bc6fce06d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-01-28 Anders Carlsson + + * gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the + default mod mask so accels work when numlock is on. + Sun Jan 27 23:23:23 2002 Kristian Rietveld * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 653b69cecd..0e52167621 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -774,7 +774,7 @@ gtk_accel_groups_activate (GObject *object, GQuark accel_quark; GSList *slist; - accel_name = gtk_accelerator_name (accel_key, accel_mods); + accel_name = gtk_accelerator_name (accel_key, (accel_mods & gtk_accelerator_get_default_mod_mask ())); accel_quark = g_quark_from_string (accel_name); g_free (accel_name);