Merge lp:~junrrein/pantheon-files/fix-1184104-yeah into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

When destroying a list view, unload the loaded subdirectories so that signal handlers get disconnected, preventing crashes.

When destroying a list view, unload the loaded subdirectories so that signal handlers get disconnected, preventing crashes.

[lp:~junrrein/pantheon-files/fix-1184104-yeah]

1213. By Julián Unrrein on 2013-06-13

Merge changes from trunk.

1214. By Julián Unrrein on 2013-06-13

Remove an unnecesary g_list_free after iterating over a list.

[Victor Martinez (victored)]

Works fine here

review: Approve

=== modified file 'src/fm-list-view.c'
--- src/fm-list-view.c	2013-06-01 20:18:10 +0000
+++ src/fm-list-view.c	2013-06-14 00:13:42 +0000
@@ -99,6 +99,10 @@
             if (!gtk_tree_view_row_expanded (unload_data->view->tree,
                                              path)) {
                 fm_list_model_unload_subdirectory (model, &iter);
+                //Remove the unloaded subdirectory from the subdirectories list.
+                unload_data->view->loaded_subdirectories = g_list_remove (
+                                                                unload_data->view->loaded_subdirectories,
+                                                                unload_data->directory);
             }
             gtk_tree_path_free (path);
         }
@@ -119,6 +123,8 @@
 
     if (fm_list_model_load_subdirectory (view->model, path, &directory)) {
         fm_directory_view_add_subdirectory (FM_DIRECTORY_VIEW (view), directory);
+        //Add the subdirectory to the loaded subdirectories list.
+        view->loaded_subdirectories = g_list_append (view->loaded_subdirectories, directory);
     }
 }
 
@@ -885,6 +891,15 @@
 
     g_debug ("%s\n", G_STRFUNC);
 
+    //Unload all the subdirectories in the loaded subdirectories list.
+    GList *l = NULL;
+    for (l = view->loaded_subdirectories; l != NULL; l = l->next) {
+        GOFDirectoryAsync *directory = GOF_DIRECTORY_ASYNC (l->data);
+        fm_directory_view_remove_subdirectory (FM_DIRECTORY_VIEW (view), directory);
+    }
+    
+    g_list_free (view->loaded_subdirectories);
+
     g_free (view->details->original_name);
 	view->details->original_name = NULL;
 
@@ -900,6 +915,7 @@
 {
     view->details = g_new0 (FMListViewDetails, 1);
     view->details->selection = NULL;
+    view->loaded_subdirectories = NULL;
 
     create_and_set_up_tree_view (view);
 

=== modified file 'src/fm-list-view.h'
--- src/fm-list-view.h	2011-12-18 03:39:58 +0000
+++ src/fm-list-view.h	2013-06-14 00:13:42 +0000
@@ -46,6 +46,7 @@
     FMListModel         *model;
 
     FMListViewDetails   *details;
+    GList               *loaded_subdirectories;
 } FMListView;
 
 typedef struct {