diff options
author | B Stack <bgstack15@gmail.com> | 2020-12-10 12:28:18 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-12-10 12:28:18 +0000 |
commit | 95d1c5485ea21247f0311ea646e17965170766e8 (patch) | |
tree | a5ad6d0ca55c3915d2ae29e65c6b1cffbf9d57fd /freefilesync/ffs_no_check_updates.patch | |
parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
parent | ffs rpm 11.4 (diff) | |
download | stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.tar.gz stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.tar.bz2 stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.zip |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 11.4
See merge request bgstack15/stackrpms!206
Diffstat (limited to 'freefilesync/ffs_no_check_updates.patch')
-rw-r--r-- | freefilesync/ffs_no_check_updates.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch index 4616461..2413cba 100644 --- a/freefilesync/ffs_no_check_updates.patch +++ b/freefilesync/ffs_no_check_updates.patch @@ -1,32 +1,33 @@ -diff -aur 11.2-0/FreeFileSync/Source/ui/main_dlg.cpp 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp ---- 11.2-0/FreeFileSync/Source/ui/main_dlg.cpp 2020-10-02 14:39:05.333463811 -0400 -+++ 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-10-02 14:52:01.515034696 -0400 -@@ -5621,7 +5621,7 @@ - globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value! +diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-0/FreeFileSync/Source/ui/main_dlg.cpp 11.4-1/FreeFileSync/Source/ui/main_dlg.cpp +--- 11.4-0/FreeFileSync/Source/ui/main_dlg.cpp 2020-12-08 08:15:29.432156507 -0500 ++++ 11.4-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-12-08 18:29:47.210277596 -0500 +@@ -5552,7 +5552,7 @@ + globalCfg_.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value! - m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); + m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.lastUpdateCheck)); - + /* - if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) + if (shouldRunAutomaticUpdateCheck(globalCfg_.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5629,6 +5629,7 @@ - automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, +@@ -5560,6 +5560,7 @@ + automaticUpdateCheckEval(this, globalCfg_.lastUpdateCheck, globalCfg_.lastOnlineVersion, automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get()); } + */ } -@@ -5653,6 +5654,7 @@ +@@ -5583,7 +5584,7 @@ + m_menubar->Append(menu, blackStar + L' ' + replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(globalCfg_.lastOnlineVersion)) + L' ' + blackStar); } }; - +- + /* - if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) + if (shouldRunAutomaticUpdateCheck(globalCfg_.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5669,6 +5671,7 @@ +@@ -5600,6 +5601,7 @@ } else showNewVersionReminder(); |