[nautilus/wip/csoriano/view-slot-hateness: 6/8] files-view: don't remove model when stoping view
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/csoriano/view-slot-hateness: 6/8] files-view: don't remove model when stoping view
- Date: Wed, 13 Jan 2016 20:11:51 +0000 (UTC)
commit e11f7c8966df39ca7f844c7d807fd4ce4d155aa0
Author: Carlos Soriano <csoriano gnome org>
Date: Wed Jan 13 20:33:07 2016 +0100
files-view: don't remove model when stoping view
So when searching, window-slot is able to get the location.
src/nautilus-files-view.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 1526e92..9863e1f 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -2860,6 +2860,11 @@ nautilus_files_view_destroy (GtkWidget *object)
view->details->in_destruction = TRUE;
nautilus_files_view_stop_loading (view);
+ if (view->details->model) {
+ nautilus_directory_unref (view->details->model);
+ view->details->model = NULL;
+ }
+
for (node = view->details->scripts_directory_list; node != NULL; node = next) {
next = node->next;
remove_directory_from_scripts_directory_list (view, node->data);
@@ -7374,10 +7379,6 @@ nautilus_files_view_stop_loading (NautilusFilesView *view)
done_loading (view, FALSE);
disconnect_model_handlers (view);
- if (view->details->model) {
- nautilus_directory_unref (view->details->model);
- view->details->model = NULL;
- }
}
gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]