nautilus r13841 - in trunk: . libnautilus-private src
- From: cneumair svn gnome org
- To: svn-commits-list gnome org
- Subject: nautilus r13841 - in trunk: . libnautilus-private src
- Date: Wed, 27 Feb 2008 15:02:58 +0000 (GMT)
Author: cneumair
Date: Wed Feb 27 15:02:58 2008
New Revision: 13841
URL: http://svn.gnome.org/viewvc/nautilus?rev=13841&view=rev
Log:
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).
Modified:
trunk/ChangeLog
trunk/libnautilus-private/nautilus-metafile.c
trunk/src/nautilus-pathbar.c
Modified: trunk/libnautilus-private/nautilus-metafile.c
==============================================================================
--- trunk/libnautilus-private/nautilus-metafile.c (original)
+++ trunk/libnautilus-private/nautilus-metafile.c Wed Feb 27 15:02:58 2008
@@ -1723,6 +1723,10 @@
static void
metafile_read_state_free (MetafileReadState *state)
{
+ if (state == NULL) {
+ return;
+ }
+
g_object_unref (state->cancellable);
g_free (state);
}
Modified: trunk/src/nautilus-pathbar.c
==============================================================================
--- trunk/src/nautilus-pathbar.c (original)
+++ trunk/src/nautilus-pathbar.c Wed Feb 27 15:02:58 2008
@@ -338,6 +338,9 @@
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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]