diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2003-07-03 13:56:37 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2003-07-03 13:56:37 +0000 |
| commit | 73930e8c2ad3b5e28df53c328d00581f99a5ced8 (patch) | |
| tree | faa85b73d167c1e511009156e300162f49de226b | |
| parent | 018c1f79966a82fff8a61600cf4c1cdd8ad2daf1 (diff) | |
| download | gnome-control-center-73930e8c2ad3b5e28df53c328d00581f99a5ced8.tar.gz | |
Merge Anders' fix from stable.
2003-07-03 Kjartan Maraas <kmaraas@gnome.org>
* gconf-property-editor.c: (gconf_property_editor_finalize):
Merge Anders' fix from stable.
| -rw-r--r-- | capplets/common/ChangeLog | 5 | ||||
| -rw-r--r-- | capplets/common/gconf-property-editor.c | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index e142623ae..249e21fe0 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -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 diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c index a46f37105..bffb6ace7 100644 --- a/capplets/common/gconf-property-editor.c +++ b/capplets/common/gconf-property-editor.c @@ -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); |