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

[Julián Unrrein]

[List View] No longer crash when dragging items to the blank space under an expanded empty folder. Fixes bug #1035144.

When testing this branch, keep in mind bug #1017094.

[Victor Martinez (victored)]

Thanks for the fix Julián!

I was fearing that this code would introduce problems to the icon view, but since this portion of code is guarded by "if (G_LIKELY (path != NULL)) { .. }" it has no side effects for the case where a file is being dragged into a blank area of the icon view, so this is fine (this comment is mostly a self-reminder).

review: Approve

[Julián Unrrein (junrrein)]

Thanks for the review and for the insight!

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2013-02-05 14:13:21 +0000
+++ src/fm-directory-view.c	2013-02-07 22:05:24 +0000
@@ -992,6 +992,18 @@
         //printf ("%s path %s\n", G_STRFUNC, gtk_tree_path_to_string (path));
         /* determine the file for the path */
         file = fm_list_model_file_for_path (view->model, path);
+        
+        /* If file == NULL, it means that the path in question is a blank path,
+         * which can only exist under an expanded empty folder.
+         * In this case, we set the destination target to that folder. */
+         if (file == NULL) {
+            /* The original path isn't modified. The graphical results are
+             * more pleasant in this way. */
+            GtkTreePath *folder_path = gtk_tree_path_copy (path);
+            gtk_tree_path_up (folder_path);
+            file = fm_list_model_file_for_path (view->model, folder_path);
+         }
+
         printf ("%s %s\n", G_STRFUNC, file->uri);
 
         /* we can only drop to directories and executable files */