Merge lp:~jeremywootten/pantheon-files/fix-1641565-trash-restore-fails-with-kanji into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Correctly validate file names with CJK characters when restoring files from the trash (lp:1641565)

This branch fixes a faulty validity check on files being restored, which failed if the first character of the filename was Chinese/Japanese.

[lp:~jeremywootten/pantheon-files/fix-1641565-trash-restore-fails-with-kanji]

2410. By Jeremy Wootten on 2017-01-16

Merge trunk r2445

=== modified file 'libcore/FileUtils.vala'
--- libcore/FileUtils.vala	2016-12-31 19:42:09 +0000
+++ libcore/FileUtils.vala	2017-01-16 12:29:16 +0000
@@ -77,9 +77,8 @@
         unhandled_files = null;
 
         foreach (GOF.File goffile in files) {
-            var location = goffile.location;
             /* Check it is a valid file (e.g. not a dummy row from list view) */
-            if (!(location != null && goffile.basename.char_count (2) > 0)) {
+            if (goffile == null || goffile.location == null) {
                 continue;
             }