diff options
| author | Michael Meeks <michael@ximian.com> | 2002-05-17 14:11:25 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-05-17 14:11:25 +0000 |
| commit | a8708eb85fdf78d0240630a320104872c7db66f3 (patch) | |
| tree | 6069cbb344f2fc4649257af0ef231ac5a28910a7 /src/file-manager/fm-directory-view.c | |
| parent | 1046a3339ce7a05338c49ed6fb28e41dd2126fc4 (diff) | |
| download | nautilus-a8708eb85fdf78d0240630a320104872c7db66f3.tar.gz | |
require libbonoboui >= 1.116.1 [ CVS ]
2002-05-17 Michael Meeks <michael@ximian.com>
* configure.in: require libbonoboui >= 1.116.1 [ CVS ]
* src/file-manager/fm-list-model.c
(fm_list_model_clear): add pre-condition.
* src/file-manager/fm-list-view.c
(create_and_set_up_tree_view): hold a ref on the model.
(fm_list_view_dispose): impl.
(fm_list_view_class_init): upd.
(fm_list_view_clear): only clear a non NULL model.
* src/file-manager/fm-icon-view.c
(get_icon_container): return NULL if we've no container.
(fm_icon_view_clear): tolerate a NIL icon_container
( on a 2nd dispose perhaps )
* libnautilus-private/nautilus-directory-background.c
(nautilus_file_background_read_desktop_settings): check
the wallpaper_filename is not empty.
* src/file-manager/fm-directory-view.c
(fm_directory_view_destroy): hoist pointer
NULLification up the method.
2002-05-16 Michael Meeks <michael@ximian.com>
* libnautilus-private/nautilus-bookmark.c
(nautilus_bookmark_get_pixmap_and_mask): kill, unused.
Diffstat (limited to 'src/file-manager/fm-directory-view.c')
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 97ba12c71..7a3327028 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1285,11 +1285,6 @@ fm_directory_view_destroy (GtkObject *object) FMDirectoryView *view; view = FM_DIRECTORY_VIEW (object); - - monitor_file_for_open_with (view, NULL); - - fm_directory_view_stop (view); - fm_directory_view_clear (view); /* Since we are owned by the NautilusView, if we're going it's * gone. It would be even better to NULL this out when the @@ -1298,6 +1293,11 @@ fm_directory_view_destroy (GtkObject *object) */ view->details->zoomable = NULL; view->details->nautilus_view = NULL; + + monitor_file_for_open_with (view, NULL); + + fm_directory_view_stop (view); + fm_directory_view_clear (view); EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); } @@ -1674,6 +1674,7 @@ done_loading (FMDirectoryView *view) selection = file_list_from_uri_list (uris_selected); eel_g_list_free_deep (uris_selected); + view->details->selection_change_is_due_to_shell = TRUE; fm_directory_view_set_selection (view, selection); view->details->selection_change_is_due_to_shell = FALSE; |