From 28904a46a16389e5e265a9e0f4c3d4346b165742 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Wed, 27 Feb 2008 15:02:58 +0000 Subject: [PATCH] Handle NULL state (#512042). Disconnect trash monitor signal (#519050). 2008-02-07 Christian Neumair * libnautilus-private/nautilus-metafile.c: (metafile_read_state_free): Handle NULL state (#512042). * src/nautilus-pathbar.c: (nautilus_path_bar_finalize): Disconnect trash monitor signal (#519050). svn path=/trunk/; revision=13841 --- ChangeLog | 7 +++++++ libnautilus-private/nautilus-metafile.c | 4 ++++ src/nautilus-pathbar.c | 3 +++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 86653d3b0..a1abeecea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-07 Christian Neumair + + * libnautilus-private/nautilus-metafile.c: (metafile_read_state_free): + Handle NULL state (#512042). + * src/nautilus-pathbar.c: (nautilus_path_bar_finalize): Disconnect + trash monitor signal (#519050). + 2008-02-26 Alexander Larsson * src/nautilus-autorun-software.c (autorun): diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c index 6797626ac..da77f7728 100644 --- a/libnautilus-private/nautilus-metafile.c +++ b/libnautilus-private/nautilus-metafile.c @@ -1723,6 +1723,10 @@ metafile_read_cancel (NautilusMetafile *metafile) static void metafile_read_state_free (MetafileReadState *state) { + if (state == NULL) { + return; + } + g_object_unref (state->cancellable); g_free (state); } diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index c6ceb819f..7195a404b 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -338,6 +338,9 @@ nautilus_path_bar_finalize (GObject *object) path_bar->desktop_icon = NULL; } + g_signal_disconnect_by_func (nautilus_trash_monitor_get (), + trash_state_changed_cb, path_bar); + G_OBJECT_CLASS (nautilus_path_bar_parent_class)->finalize (object); } -- GitLab