diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-12-10 15:30:49 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-12-10 15:30:49 +0000 |
| commit | c2e8c49325e441bce8e7db60e3d054aa990138c2 (patch) | |
| tree | 50619925ad2dd21d549b3d72fecc29496b15b69d /libnautilus-private/nautilus-directory.c | |
| parent | 679a09d262088aac862988947ead39cdf9dfb0ca (diff) | |
| download | nautilus-c2e8c49325e441bce8e7db60e3d054aa990138c2.tar.gz | |
Removed. Removed. Removed.
2007-12-10 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-directory-async.c:
* libnautilus-private/nautilus-directory-metafile.[ch]:
* libnautilus-private/nautilus-metafile.[ch]:
* libnautilus-private/nautilus-directory-private.h:
* libnautilus-private/nautilus-directory.c:
* libnautilus-private/Makefile.am:
* libnautilus-private/nautilus-directory-metafile-monitor.[ch]: Removed.
* libnautilus-private/nautilus-metafile-factory.[ch]: Removed.
* libnautilus-private/nautilus-metafile-server.idl: Removed.
* src/nautilus-application.c:
* src/nautilus-main.c:
* src/nautilus-spatial-window.c:
Remove the bonobo layer for metadata, as we're always in-process anyway
these days.
svn path=/trunk/; revision=13515
Diffstat (limited to 'libnautilus-private/nautilus-directory.c')
| -rw-r--r-- | libnautilus-private/nautilus-directory.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index a2622734e..bad713ab2 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -190,11 +190,13 @@ nautilus_directory_finalize (GObject *object) nautilus_monitor_cancel (directory->details->monitor); } - if (directory->details->metafile_monitor != NULL) { + if (directory->details->metafile_monitored) { nautilus_directory_unregister_metadata_monitor (directory); } - bonobo_object_release_unref (directory->details->metafile_corba_object, NULL); + if (directory->details->metafile != NULL) { + g_object_unref (directory->details->metafile); + } if (directory->details->dequeue_pending_idle_id != 0) { g_source_remove (directory->details->dequeue_pending_idle_id); |