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)
This commit is contained in:
Owen Taylor 2002-03-14 16:20:42 +00:00 committed by Owen Taylor
parent cceb7a9823
commit 7357b205de
8 changed files with 45 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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));