Commit 28904a46 authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair
Browse files

Handle NULL state (#512042). Disconnect trash monitor signal (#519050).

2008-02-07  Christian Neumair  <cneumair@gnome.org>

	* 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
parent 1026e3ed
2008-02-07 Christian Neumair <cneumair@gnome.org>
* 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 <alexl@redhat.com> 2008-02-26 Alexander Larsson <alexl@redhat.com>
* src/nautilus-autorun-software.c (autorun): * src/nautilus-autorun-software.c (autorun):
......
...@@ -1723,6 +1723,10 @@ metafile_read_cancel (NautilusMetafile *metafile) ...@@ -1723,6 +1723,10 @@ metafile_read_cancel (NautilusMetafile *metafile)
static void static void
metafile_read_state_free (MetafileReadState *state) metafile_read_state_free (MetafileReadState *state)
{ {
if (state == NULL) {
return;
}
g_object_unref (state->cancellable); g_object_unref (state->cancellable);
g_free (state); g_free (state);
} }
......
...@@ -338,6 +338,9 @@ nautilus_path_bar_finalize (GObject *object) ...@@ -338,6 +338,9 @@ nautilus_path_bar_finalize (GObject *object)
path_bar->desktop_icon = NULL; 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); G_OBJECT_CLASS (nautilus_path_bar_parent_class)->finalize (object);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment