diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-03-14 16:20:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-03-14 16:20:42 +0000 |
| commit | 7357b205deb5f5f3abe5532f93b4fcb7e028db6f (patch) | |
| tree | 81cac22841aaab7eadf6279327f2e3544fe8172a | |
| parent | cceb7a98239dba25b50d41a21ecd9f131bead8da (diff) | |
| download | gdk-pixbuf-7357b205deb5f5f3abe5532f93b4fcb7e028db6f.tar.gz | |
When removing keys from the key hash, reinsert the right list back into
Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When
removing keys from the key hash, reinsert the right list
back into the hash. (Dave Camp, #74571)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkkeyhash.c | 6 |
8 files changed, 45 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 99cc98929..72695c7aa 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 99cc98929..72695c7aa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 99cc98929..72695c7aa 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 99cc98929..72695c7aa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 99cc98929..72695c7aa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 99cc98929..72695c7aa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Mar 14 11:17:18 2002 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkkeyhash.c (_gtk_key_hash_remove_entry): When + removing keys from the key hash, reinsert the right list + back into the hash. (Dave Camp, #74571) + Wed Mar 13 17:17:40 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkobject.h: Remove left-over GTK_OBJECT_CONNECTED diff --git a/gtk/gtkkeyhash.c b/gtk/gtkkeyhash.c index 642429524..bbf113926 100644 --- a/gtk/gtkkeyhash.c +++ b/gtk/gtkkeyhash.c @@ -224,12 +224,12 @@ _gtk_key_hash_remove_entry (GtkKeyHash *key_hash, GUINT_TO_POINTER (entry->keys[i].keycode)); GSList *new_keys = g_slist_remove (old_keys, entry); - if (old_keys != new_keys) + if (new_keys != old_keys) { - if (old_keys) + if (new_keys) g_hash_table_insert (key_hash->keycode_hash, GUINT_TO_POINTER (entry->keys[i].keycode), - old_keys); + new_keys); else g_hash_table_remove (key_hash->keycode_hash, GUINT_TO_POINTER (entry->keys[i].keycode)); |