summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnu.org>2002-01-28 07:43:26 +0000
committerAnders Carlsson <andersca@src.gnome.org>2002-01-28 07:43:26 +0000
commit03a160119081da763f4f631bbf05d87be23dbe74 (patch)
tree7de95769811a0058fbf1123dba3788b955d28536
parent6090d199a5ccf44c2777b66e13254754c8486e0c (diff)
downloadgdk-pixbuf-03a160119081da763f4f631bbf05d87be23dbe74.tar.gz
& 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.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkaccelgroup.c2
8 files changed, 36 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cb79045c..1bc6fce06 100644
--- 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 2cb79045c..1bc6fce06 100644
--- 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 2cb79045c..1bc6fce06 100644
--- 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 2cb79045c..1bc6fce06 100644
--- 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 2cb79045c..1bc6fce06 100644
--- 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 2cb79045c..1bc6fce06 100644
--- 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 2cb79045c..1bc6fce06 100644
--- 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 653b69cec..0e5216762 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);