Merge lp:~pqp/pantheon-files/fix-1079365 into lp:~elementary-apps/pantheon-files/trunk

[Patrick Pace]

[Cody Garver (codygarver)]

Greatness.

review: Approve

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2012-11-06 22:19:43 +0000
+++ src/fm-directory-view.c	2012-11-24 04:39:19 +0000
@@ -2644,10 +2644,15 @@
 
     locations = g_list_reverse (locations);
 
-    marlin_file_operations_trash_or_delete (locations,
-                                            GTK_WINDOW (view->details->window),
-                                            (MarlinDeleteCallback) trash_or_delete_done_cb,
-                                            view);
+    if (locations != NULL) { 
+        marlin_file_operations_trash_or_delete (locations,
+                                                GTK_WINDOW (view->details->window),
+                                                (MarlinDeleteCallback) trash_or_delete_done_cb,
+                                                view);
+    } 
+    else
+        return;
+
     g_list_free_full (locations, g_object_unref);
 }
 
@@ -2662,9 +2667,13 @@
      */
     if (!view->details->selection_was_removed) {
         selection = fm_directory_view_get_selection_for_file_transfer (view);
-        trash_or_delete_files (view, selection, TRUE);
-        gof_file_list_free (selection);
-        view->details->selection_was_removed = TRUE;
+        if (selection != NULL) {
+            trash_or_delete_files (view, selection, TRUE);
+            gof_file_list_free (selection);
+            view->details->selection_was_removed = TRUE;
+        } 
+        else 
+            return;
     }
 }