Merge lp:~jeremywootten/pantheon-files/fix-1465121-critical-warning-after-row-collapse into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix critical warnings when unloading of subdirectories (lp:1465121)

This branch prevents some critical warnings appearing in the terminal when collapsing rows in List View.

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-06-06 08:41:29 +0000
+++ src/View/AbstractDirectoryView.vala	2015-06-20 09:24:39 +0000
@@ -194,7 +194,7 @@
         private Gdk.Cursor selectable_cursor;
 
         private GLib.List<GLib.AppInfo> open_with_apps;
-        protected GLib.List<GOF.Directory.Async>? loaded_subdirectories = null;
+        protected GLib.List<GOF.Directory.Async> loaded_subdirectories = null;
 
         /*  Selected files are originally obtained with
             gtk_tree_model_get(): this function increases the reference
@@ -277,9 +277,6 @@
 
         ~AbstractDirectoryView () {
             debug ("ADV destruct");
-            loaded_subdirectories.@foreach ((dir) => {
-                remove_subdirectory (dir);
-            });
         }
 
         protected virtual void set_up_name_renderer () {
@@ -590,17 +587,11 @@
         }
 
         public void change_directory (GOF.Directory.Async old_dir, GOF.Directory.Async new_dir) {
-            cancel_thumbnailing ();
+            cancel ();
             freeze_tree ();
             old_dir.cancel ();
             disconnect_directory_handlers (old_dir);
             block_model ();
-
-            loaded_subdirectories.@foreach ((dir) => {
-                remove_subdirectory (dir);
-            });
-
-            loaded_subdirectories = null;
             model.clear ();
             unblock_model ();
             if (new_dir.can_load)
@@ -3022,7 +3013,6 @@
             slot.directory.cancel ();
             cancel_drag_timer ();
             cancel_timeout (ref drag_scroll_timer_id);
-
             loaded_subdirectories.@foreach ((dir) => {
                 remove_subdirectory (dir);
             });

=== modified file 'src/View/ListView.vala'
--- src/View/ListView.vala	2015-05-23 12:02:29 +0000
+++ src/View/ListView.vala	2015-06-20 09:24:39 +0000
@@ -30,6 +30,7 @@
         };
 
         private uint unload_file_timeout_id = 0;
+        private GLib.List<GOF.File> subdirectories_to_unload = null;
 
         public ListView (Marlin.View.Slot _slot) {
             base (_slot);
@@ -82,8 +83,9 @@
             set_path_expanded (path, false);
 
             if (model.get_directory_file (path, out dir, out file)) {
-                schedule_model_unload_directory (file, dir);
                 remove_subdirectory (dir);
+                subdirectories_to_unload.append (file);
+                schedule_model_unload_directories ();
             } else
                 critical ("failed to get directory/file");
         }
@@ -95,8 +97,14 @@
                 file.set_expanded (expanded);
         }
 
-        private void schedule_model_unload_directory (GOF.File file, GOF.Directory.Async directory) {
-            unload_file_timeout_id = GLib.Timeout.add_seconds (COLLAPSE_TO_UNLOAD_DELAY, () => {
+        private void schedule_model_unload_directories () {
+            cancel_file_timeout ();
+            unload_file_timeout_id = GLib.Timeout.add_seconds (COLLAPSE_TO_UNLOAD_DELAY, 
+                                                               unload_directories);
+        }
+
+        private bool unload_directories () {
+            foreach (var file in subdirectories_to_unload) {
                 Gtk.TreeIter iter;
                 Gtk.TreePath path;
 
@@ -105,11 +113,15 @@
                     if (path != null && !((Gtk.TreeView)tree).is_row_expanded (path))
                         model.unload_subdirectory (iter);
                 } else
-                    critical ("Failed to get iter");
+                    warning ("Subdirectory to unload not found in model");
+            }
 
-                unload_file_timeout_id = 0;
-                return false;
+            subdirectories_to_unload.@foreach ((file) => {
+                subdirectories_to_unload.remove (file);
             });
+
+            unload_file_timeout_id = 0;
+            return false;
         }
 
         private void cancel_file_timeout () {