projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0adbacb
)
nothing to see here... move along, move along :)
author
Ryan Lortie
<ryanl@src.gnome.org>
Wed, 28 Nov 2007 03:58:08 +0000
(
03:58
+0000)
committer
Ryan Lortie
<ryanl@src.gnome.org>
Wed, 28 Nov 2007 03:58:08 +0000
(
03:58
+0000)
svn path=/trunk/; revision=5965
glib/ghash.c
patch
|
blob
|
history
diff --git
a/glib/ghash.c
b/glib/ghash.c
index
f65bebc
..
cee7691
100644
(file)
--- a/
glib/ghash.c
+++ b/
glib/ghash.c
@@
-338,11
+338,15
@@
g_hash_table_insert_internal (GHashTable *hash_table,
if (*node)
{
- if (
hash_table->key_destroy_func
)
+ if (
keep_new_key
)
{
- if (
keep_new_key
)
+ if (
hash_table->key_destroy_func
)
hash_table->key_destroy_func ((*node)->key);
- else
+ (*node)->key = key;
+ }
+ else
+ {
+ if (hash_table->key_destroy_func)
hash_table->key_destroy_func (key);
}