summaryrefslogtreecommitdiff
path: root/src/BatchImport.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-06-05 04:23:52 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-06-05 04:23:52 +0200
commitbec5f87053759705fb77bae1aa378f2666c7d153 (patch)
treebd955b9777aa39b207fa161edf19a6609f822909 /src/BatchImport.vala
parent1c99a41a296cda6647edc32437a813f6923cb1d0 (diff)
parent4e10e30c2f99d552239871aa1b27a08a6c18f1a4 (diff)
Merge tag 'upstream/0.23.1'
Upstream version 0.23.1
Diffstat (limited to 'src/BatchImport.vala')
-rw-r--r--src/BatchImport.vala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 13feabe..4a46a26 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
*
* This software is licensed under the GNU LGPL (version 2.1 or later).
* See the COPYING file in this distribution.
@@ -431,7 +431,7 @@ public class BatchImport : Object {
private Gee.HashMap<string, File> imported_full_md5_table = new Gee.HashMap<string, File>();
#endif
private uint throbber_id = 0;
- private int max_outstanding_import_jobs = Workers.thread_per_cpu_minus_one();
+ private uint max_outstanding_import_jobs = Workers.thread_per_cpu_minus_one();
private bool untrash_duplicates = true;
private bool mark_duplicates_online = true;