diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-03-23 22:41:19 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-03-23 22:41:19 +0000 |
| commit | e14985a9ad392684d8976e72348a47cd8a9b7274 (patch) | |
| tree | 4b1ede4ef9234bdb51fd634ede86b3cfc07a6b94 /src/nautilus-object-window.c | |
| parent | 433efe122fb066303eee3b3fc923ae0905554724 (diff) | |
| download | nautilus-e14985a9ad392684d8976e72348a47cd8a9b7274.tar.gz | |
Fixed bug 336 (merged menu items don't go away when component
is swapped out).
* src/file-manager/fm-directory-view.c: (fm_directory_view_destroy):
While debugging, I noticed that the view_frame was allocated by the
FMDirectoryView and never unref'd. The exact connection of this to
why the widgets don't go away is now lost in time. We added a call
to bonobo_object_unref to get rid of the view frame.
* src/ntl-window.h, src/ntl-window.c, src/ntl-window-msgs.c:
(Nautilus_NavigationInfo_free): Got rid of this routine. It turns
out that this was an incorrect hack to work around the error in
the surrounding code that was copying CORBA object references
without calling CORBA_Object_duplicate.
(nautilus_window_destroy), (nautilus_window_request_selection_change):
Changed code that was calling Nautilus_NavigationInfo_free to just
call CORBA_free now that the incorrect hack is not needed.
(nautilus_window_request_selection_change),
(nautilus_window_update_view),
(nautilus_window_update_internals),
(nautilus_window_load_content_view): Changed all code that was
manipulating content_view to use CORBA_Object_duplicate when
storing a reference and CORBA_Object_release when overwriting
a reference.
Diffstat (limited to 'src/nautilus-object-window.c')
| -rw-r--r-- | src/nautilus-object-window.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index f87bfba5a..6d9c64d66 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -513,7 +513,7 @@ nautilus_window_destroy (NautilusWindow *window) g_slist_free(window->meta_views); - Nautilus_NavigationInfo_free (window->ni); + CORBA_free(window->ni); CORBA_free(window->si); g_slist_foreach(window->back_list, (GFunc)gtk_object_unref, NULL); g_slist_foreach(window->forward_list, (GFunc)gtk_object_unref, NULL); @@ -942,4 +942,3 @@ nautilus_window_real_set_content_view (NautilusWindow *window, NautilusView *new gtk_widget_queue_resize(window->content_hbox); window->content_view = new_view; } - |