gnome-base/gnome-control-center: Add different patch
[phenriksson.git] / local-gnome / gnome-base / gnome-control-center / files / gnome-control-center-2.26.0-gconf-unref.patch
blob24e8938d81e72c4a5412575f8e4f1203a42f0c5e
1 Fix excessive gconf_entry_free. It causes capplets crashes when gconf isn't build with g_asserts.
3 Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=583117
4 Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=270319
5 --- a/capplets/common/gconf-property-editor.c
6 +++ b/capplets/common/gconf-property-editor.c
7 @@ -351,7 +351,8 @@
8 gconf_entry = gconf_client_get_entry (client, GCONF_PROPERTY_EDITOR (obj)->p->key, NULL, TRUE, NULL);
9 GCONF_PROPERTY_EDITOR (obj)->p->callback (client, 0, gconf_entry, obj);
10 GCONF_PROPERTY_EDITOR (obj)->p->inited = TRUE;
11 - gconf_entry_free (gconf_entry);
12 + if (gconf_entry)
13 + gconf_entry_free (gconf_entry);
14 g_object_unref (client);
16 return obj;