applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Anders' fix from stable.

Browse source 
2003-07-03  Kjartan Maraas  <kmaraas@gnome.org>

	* gconf-property-editor.c: (gconf_property_editor_finalize):
	Merge Anders' fix from stable.
This commit is contained in:
Kjartan Maraas 2003-07-03 13:56:37 +00:00 • committed by Kjartan Maraas
parent 018c1f7996
commit 73930e8c2a
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/common/ChangeLog
View file

@ -1,3 +1,8 @@
2003-07-03 Kjartan Maraas <kmaraas@gnome.org>
* gconf-property-editor.c: (gconf_property_editor_finalize):
Merge Anders' fix from stable.
2003-07-02 Mark McLoughlin <mark@skynet.ie>
Handle crashes of the thumbnailer child process a

10
capplets/common/gconf-property-editor.c
View file

@ -326,9 +326,17 @@ gconf_property_editor_finalize (GObject *object)
g_return_if_fail (IS_GCONF_PROPERTY_EDITOR (object));
gconf_property_editor = GCONF_PROPERTY_EDITOR (object);
if (gconf_property_editor->p->data_free_cb)
gconf_property_editor->p->data_free_cb (gconf_property_editor->p->data);
if (gconf_property_editor->p->handler_id != 0) {
GConfClient *client;
client = gconf_client_get_default ();
gconf_client_notify_remove (client,
gconf_property_editor->p->handler_id);
}
g_free (gconf_property_editor->p);