diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-09-17 19:25:54 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-09-17 19:25:54 +0200 |
| commit | bfe278cbf84a441a951d48dc528f20226127e1f3 (patch) | |
| tree | d707e50cdc207014b14c66e713090f5803e01f8a | |
| parent | 46544c9885b7064c216f1a9401d42bdb9816bdd2 (diff) | |
| download | nautilus-bfe278cbf84a441a951d48dc528f20226127e1f3.tar.gz | |
Clear the list model in _finalize() instead of _dispose()
We have the only reference to the model anyway. This fixes a crash when
_end_loading() is called for a windiow before it finished loading.
| -rw-r--r-- | src/file-manager/fm-list-view.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 9980dabeb..1f235de23 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -2812,12 +2812,6 @@ fm_list_view_dispose (GObject *object) list_view = FM_LIST_VIEW (object); - if (list_view->details->model) { - stop_cell_editing (list_view); - g_object_unref (list_view->details->model); - list_view->details->model = NULL; - } - if (list_view->details->drag_dest) { g_object_unref (list_view->details->drag_dest); list_view->details->drag_dest = NULL; @@ -2844,6 +2838,12 @@ fm_list_view_finalize (GObject *object) list_view = FM_LIST_VIEW (object); + if (list_view->details->model) { + stop_cell_editing (list_view); + g_object_unref (list_view->details->model); + list_view->details->model = NULL; + } + g_free (list_view->details->original_name); list_view->details->original_name = NULL; |