[shotwell] Revert "Merge branch 'dontImportFromHiddenDirs' into 'master'"



commit 397f7166ce58529dd664c8d2a1f257678865a66c
Author: Jens Georg <mail jensge org>
Date:   Tue Oct 9 07:26:10 2018 +0200

    Revert "Merge branch 'dontImportFromHiddenDirs' into 'master'"
    
    Accidentally merged being fooled by gitlab's ability to create merge
    requests from attached patches.
    
    This reverts commit ce88e7a4f7368830ff4c6f078f7cbb19d013b344, reversing
    changes made to 029453bbbd4f5104ae4c397d7791f83a109bc36a.

 src/camera/ImportPage.vala | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index b99bb79e..08395908 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1493,12 +1493,8 @@ public class ImportPage : CheckerboardPage {
                 return false;
             }
             
-            if (subdir.has_prefix(".")) {
-                debug("Skipping hidden sub-folder %s in %s", subdir, dir);
-            } else {
-                if (!enumerate_files(fsid, append_path(dir, subdir), import_list))
-                    return false;
-            }
+            if (!enumerate_files(fsid, append_path(dir, subdir), import_list))
+                return false;
         }
         
         return true;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]