diff options
| author | B Stack <bgstack15@gmail.com> | 2020-10-04 11:46:12 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-10-04 11:46:12 +0000 |
| commit | cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662 (patch) | |
| tree | 6e241f90b1671aaaf7e33145fc21eaea253c3735 /freefilesync/ffs_allow_parallel_ops.patch | |
| parent | Merge branch 'scite-bump' into 'master' (diff) | |
| parent | ffs 11.2 rpm for fedora (diff) | |
| download | stackrpms-cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662.tar.gz stackrpms-cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662.tar.bz2 stackrpms-cdc9dbcce2dfd0ef25ac52488e072de0dbf7c662.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.2
See merge request bgstack15/stackrpms!194
Diffstat (limited to 'freefilesync/ffs_allow_parallel_ops.patch')
| -rw-r--r-- | freefilesync/ffs_allow_parallel_ops.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/freefilesync/ffs_allow_parallel_ops.patch b/freefilesync/ffs_allow_parallel_ops.patch index d317bf0..040369f 100644 --- a/freefilesync/ffs_allow_parallel_ops.patch +++ b/freefilesync/ffs_allow_parallel_ops.patch @@ -1,20 +1,20 @@ This is still experimental. -diff -x '*.orig' -x '*.swp' -x '*.rej' -Naur 10.9-0/FreeFileSync/Source/ui/folder_selector.cpp 10.9-1/FreeFileSync/Source/ui/folder_selector.cpp ---- 10.9-0/FreeFileSync/Source/ui/folder_selector.cpp 2019-02-10 16:42:28.960039117 -0500 -+++ 10.9-1/FreeFileSync/Source/ui/folder_selector.cpp 2019-02-10 20:20:11.981339625 -0500 -@@ -231,7 +231,7 @@ - +diff -aur 11.2-0/FreeFileSync/Source/ui/folder_selector.cpp 11.2-1/FreeFileSync/Source/ui/folder_selector.cpp +--- 11.2-0/FreeFileSync/Source/ui/folder_selector.cpp 2020-10-02 14:39:05.297463367 -0400 ++++ 11.2-1/FreeFileSync/Source/ui/folder_selector.cpp 2020-10-02 15:01:06.505758389 -0400 +@@ -260,7 +260,7 @@ + std::optional<std::wstring> parallelOpsDisabledReason; - + - parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition"); + // parallelOpsDisabledReason = _("Requires FreeFileSync Donation Edition"); - - if (showCloudSetupDialog(parent_, folderPathPhrase, parallelOps, get(parallelOpsDisabledReason)) != ReturnSmallDlg::BUTTON_OKAY) + + if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, get(parallelOpsDisabledReason)) != ConfirmationButton::accept) return; -diff -Naur -x '*.orig' -x '*.rej' 10.9-0/FreeFileSync/Source/ui/sync_cfg.cpp 10.9-1/FreeFileSync/Source/ui/sync_cfg.cpp ---- 10.21-0/FreeFileSync/Source/ui/sync_cfg.cpp 2020-03-18 08:56:08.644066742 -0400 -+++ 10.21-1/FreeFileSync/Source/ui/sync_cfg.cpp 2020-03-18 09:13:30.459409986 -0400 -@@ -290,7 +290,7 @@ +diff -aur 11.2-0/FreeFileSync/Source/ui/sync_cfg.cpp 11.2-1/FreeFileSync/Source/ui/sync_cfg.cpp +--- 11.2-0/FreeFileSync/Source/ui/sync_cfg.cpp 2020-10-02 14:39:05.289463269 -0400 ++++ 11.2-1/FreeFileSync/Source/ui/sync_cfg.cpp 2020-10-02 15:01:06.509758438 -0400 +@@ -336,7 +336,7 @@ commandHistoryOut_(commandHistory), globalPairCfg_(globalPairCfg), localPairCfg_(localPairConfig), |