diff options
| author | Michael Meeks <michael@ximian.com> | 2001-12-12 23:19:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2001-12-12 23:19:36 +0000 |
| commit | 612ed122c7aa457410fb14279e90ab161a4bc15c (patch) | |
| tree | 51df5701ea67666eabe75ab3303af987f4b5e56f /src/file-manager/fm-desktop-icon-view.c | |
| parent | f9769d4cd3a5e9fb3784b45a356cbd9a1d718e14 (diff) | |
| download | nautilus-612ed122c7aa457410fb14279e90ab161a4bc15c.tar.gz | |
fix container ref leak.NAUTILUS_BEFORE_REMOVING_HELP_COMPONENT
2001-12-12 Michael Meeks <michael@ximian.com>
* src/file-manager/fm-icon-view.c
(fm_icon_view_merge_menus): fix container ref leak.
* src/file-manager/fm-search-list-view.c
(real_merge_menus): ditto.
* src/file-manager/fm-desktop-icon-view.c
(fm_desktop_icon_view_destroy): more guards.
(real_merge_menus): fix container ref leak.
Diffstat (limited to 'src/file-manager/fm-desktop-icon-view.c')
| -rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index ac536281f..73f1fa2c5 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -258,6 +258,7 @@ fm_desktop_icon_view_destroy (GtkObject *object) if (icon_view->details->ui != NULL) { bonobo_ui_component_unset_container (icon_view->details->ui, NULL); bonobo_object_unref (BONOBO_OBJECT (icon_view->details->ui)); + icon_view->details->ui = NULL; } free_volume_black_list (icon_view); @@ -1236,6 +1237,7 @@ static void real_merge_menus (FMDirectoryView *view) { FMDesktopIconView *desktop_view; + Bonobo_UIContainer ui_container; BonoboUIVerb verbs [] = { BONOBO_UI_VERB ("Change Background", change_background_callback), BONOBO_UI_VERB ("Empty Trash Conditional", empty_trash_callback), @@ -1250,9 +1252,11 @@ real_merge_menus (FMDirectoryView *view) desktop_view = FM_DESKTOP_ICON_VIEW (view); desktop_view->details->ui = bonobo_ui_component_new ("Desktop Icon View"); + + ui_container = fm_directory_view_get_bonobo_ui_container (view); bonobo_ui_component_set_container (desktop_view->details->ui, - fm_directory_view_get_bonobo_ui_container (view), - NULL); + ui_container, NULL); + bonobo_object_release_unref (ui_container, NULL); bonobo_ui_util_set_ui (desktop_view->details->ui, DATADIR, "nautilus-desktop-icon-view-ui.xml", |