blob: 24e8938d81e72c4a5412575f8e4f1203a42f0c5e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
Fix excessive gconf_entry_free. It causes capplets crashes when gconf isn't build with g_asserts.
Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=583117
Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=270319
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -351,7 +351,8 @@
gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR (obj)->p->key, NULL, TRUE, NULL);
GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
- gconf_entry_free (gconf_entry);
+ if (gconf_entry)
+ gconf_entry_free (gconf_entry);
g_object_unref (client);
return obj;
|