diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-03-01 19:23:11 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-03-01 19:23:11 +0000 |
| commit | 9901edb5e92abe7b9bc2f0841056182315c26212 (patch) | |
| tree | 8b03e566ebed0671d667ebc14b2ddc341f952368 /src/nautilus-window-manage-views.c | |
| parent | e1016051b4ea10b6b02a56004bb225a6cf05a22b (diff) | |
| download | nautilus-9901edb5e92abe7b9bc2f0841056182315c26212.tar.gz | |
Add a ref/unref so that window->details won't go away at an inopportune
* src/nautilus-window-manage-views.h:
* src/nautilus-window-manage-views.c: (begin_location_change): Add
a ref/unref so that window->details won't go away at an
inopportune time.
(nautilus_window_manage_views_finalize): Rename from destroy.
* src/nautilus-window.c: (load_mini_icon): Break into separate
function.
(set_up_default_icon_list): Break into separate function.
(nautilus_window_finalize): Change from destroy to finalize.
(nautilus_window_class_init): Move to bottom of file and simplify the
code a bit.
Diffstat (limited to 'src/nautilus-window-manage-views.c')
| -rw-r--r-- | src/nautilus-window-manage-views.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 8158a15f1..4de7e8b51 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -1417,6 +1417,8 @@ begin_location_change (NautilusWindow *window, || type == NAUTILUS_LOCATION_CHANGE_FORWARD || distance == 0); + g_object_ref (window); + end_location_change (window); nautilus_window_allow_stop (window, TRUE); @@ -1449,9 +1451,9 @@ begin_location_change (NautilusWindow *window, nautilus_directory_unref (directory); window->details->determine_view_handle = nautilus_determine_initial_view - (location, - determined_initial_view_callback, - window); + (location, determined_initial_view_callback, window); + + g_object_unref (window); } static void @@ -2022,7 +2024,7 @@ disconnect_view_callback (gpointer list_item_data, gpointer callback_data) } void -nautilus_window_manage_views_destroy (NautilusWindow *window) +nautilus_window_manage_views_finalize (NautilusWindow *window) { free_location_change (window); |