diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-03-25 15:26:14 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-03-25 15:26:14 -0400 |
| commit | 4e75a3b805b007c863ad2eb4b3be62a97249c33d (patch) | |
| tree | 09d2c34563883495342582f5c1db36a3caee4131 | |
| parent | 199e5adb8a51c9cd54a644de60b01d9c0cd2170d (diff) | |
| download | nautilus-4e75a3b805b007c863ad2eb4b3be62a97249c33d.tar.gz | |
icon-view: clear the icon view when destroying it2.91.93
This ensures all NautilusFiles are properly unreffed when destroying the
view, and fixes a leak.
| -rw-r--r-- | src/nautilus-icon-view.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nautilus-icon-view.c b/src/nautilus-icon-view.c index dc6ce2204..68ba2cc62 100644 --- a/src/nautilus-icon-view.c +++ b/src/nautilus-icon-view.c @@ -198,6 +198,7 @@ static void preview_audio (NautilusI static void update_layout_menus (NautilusIconView *view); static NautilusFileSortType get_default_sort_order (NautilusFile *file, gboolean *reversed); +static void nautilus_icon_view_clear (NautilusView *view); G_DEFINE_TYPE (NautilusIconView, nautilus_icon_view, NAUTILUS_TYPE_VIEW); @@ -208,6 +209,8 @@ nautilus_icon_view_destroy (GtkWidget *object) icon_view = NAUTILUS_ICON_VIEW (object); + nautilus_icon_view_clear (NAUTILUS_VIEW (object)); + if (icon_view->details->react_to_icon_change_idle_id != 0) { g_source_remove (icon_view->details->react_to_icon_change_idle_id); icon_view->details->react_to_icon_change_idle_id = 0; @@ -2544,6 +2547,8 @@ create_icon_container (NautilusIconView *icon_view) icon_container = nautilus_icon_view_container_new (icon_view); icon_view->details->icon_container = GTK_WIDGET (icon_container); + g_object_add_weak_pointer (G_OBJECT (icon_container), + (gpointer *) &icon_view->details->icon_container); gtk_widget_set_can_focus (GTK_WIDGET (icon_container), TRUE); |