& with the default mod mask so accels work when numlock is on.

2002-01-28  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtkaccelgroup.c (gtk_accel_groups_activate): & with the
	default mod mask so accels work when numlock is on.

diff --git a/ChangeLog b/ChangeLog
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2cb79045cb744d70fa579d9e3617499a590e080a..1bc6fce06d51e8a53b1d7e72012d1656c440c282 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-28  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <kris@gtk.org>
 
        * gtk/gtkrbtree.[ch]: add _gtk_rbtree_mark_invalid (my previous

diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 653b69cecd4f64a25ccce22f7125bd446f3f4e5d..0e521676212a4acfaf7e48921a33a951905be49d 100644 (file)
--- 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);