[shotwell] Revert "Revert "Merge branch 'dontImportFromHiddenDirs' into 'master'""
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Revert "Revert "Merge branch 'dontImportFromHiddenDirs' into 'master'""
- Date: Tue, 9 Oct 2018 06:32:27 +0000 (UTC)
commit 724691a5d4600675a500db0a57ae745af4e0db3e
Author: Jens Georg <mail jensge org>
Date: Tue Oct 9 08:32:07 2018 +0200
Revert "Revert "Merge branch 'dontImportFromHiddenDirs' into 'master'""
I'm stupid and mixed up bugs.
This reverts commit 397f7166ce58529dd664c8d2a1f257678865a66c.
src/camera/ImportPage.vala | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 08395908..b99bb79e 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1493,8 +1493,12 @@ public class ImportPage : CheckerboardPage {
return false;
}
- if (!enumerate_files(fsid, append_path(dir, subdir), import_list))
- 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;
+ }
}
return true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]