Merge from stable branch
This commit is contained in:
parent
e3e9279f0c
commit
60980d0fe5
9 changed files with 35 additions and 9 deletions
|
@ -374,7 +374,8 @@ gconf_peditor_new (gchar *key,
|
|||
GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
|
||||
GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
|
||||
gconf_entry_free (gconf_entry);
|
||||
|
||||
g_object_unref (G_OBJECT (client));
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue