diff options
| author | Michael Meeks <michael@ximian.com> | 2002-03-05 11:54:22 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-03-05 11:54:22 +0000 |
| commit | 0e7e5c7153895c38d2fdf0e19a5d161fd279b6c2 (patch) | |
| tree | 2bb560468ed2d4c3440507e5c88bfcd01f1aea69 | |
| parent | 358d9c192ab182591d6f90f30d6c666ceafae677 (diff) | |
| download | nautilus-0e7e5c7153895c38d2fdf0e19a5d161fd279b6c2.tar.gz | |
check if zoomable is non NULL. (fm_directory_view_destroy): NULL the
2002-03-05 Michael Meeks <michael@ximian.com>
* src/file-manager/fm-directory-view.c
(fm_directory_view_supports_zooming): check if
zoomable is non NULL.
(fm_directory_view_destroy): NULL the zoomable at
the same time as the nautilus_view, since they're
the same aggregate.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 5 |
2 files changed, 12 insertions, 0 deletions
@@ -1,5 +1,12 @@ 2002-03-05 Michael Meeks <michael@ximian.com> + * src/file-manager/fm-directory-view.c + (fm_directory_view_supports_zooming): check if + zoomable is non NULL. + (fm_directory_view_destroy): NULL the zoomable at + the same time as the nautilus_view, since they're + the same aggregate. + * libnautilus-private/nautilus-icon-factory.c (get_image_cache_view): impl. (cache_icon_new): add the icon to the cache view. diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index f41c779c2..80e9899b5 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1306,6 +1306,7 @@ fm_directory_view_destroy (GtkObject *object) * NautilusView goes away, but this is good enough for our * purposes. */ + view->details->zoomable = NULL; view->details->nautilus_view = NULL; EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); @@ -5356,6 +5357,10 @@ fm_directory_view_supports_zooming (FMDirectoryView *view) { g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), FALSE); + if (!view->details->zoomable) { + return FALSE; + } + return EEL_CALL_METHOD_WITH_RETURN_VALUE (FM_DIRECTORY_VIEW_CLASS, view, supports_zooming, (view)); |