diff options
Diffstat (limited to 'freefilesync/debian/patches/ffs_no_check_updates.patch')
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index fcbeb97..4616461 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -1,7 +1,7 @@ -diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/main_dlg.cpp 11.1-1/FreeFileSync/Source/ui/main_dlg.cpp ---- 11.1-0/FreeFileSync/Source/ui/main_dlg.cpp 2020-08-31 20:04:21.621863187 -0400 -+++ 11.1-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-08-31 20:55:07.732089665 -0400 -@@ -5606,7 +5606,7 @@ +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! m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); @@ -10,7 +10,7 @@ diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/main_dlg.cpp 11. if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5614,6 +5614,7 @@ +@@ -5629,6 +5629,7 @@ automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get()); } @@ -18,25 +18,25 @@ diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/main_dlg.cpp 11. } -@@ -5623,6 +5624,7 @@ - [[maybe_unused]] bool ubOk = Unbind(wxEVT_IDLE, &MainDialog::onRegularUpdateCheck, this); - assert(ubOk); +@@ -5653,6 +5654,7 @@ + } + }; + /* if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5636,6 +5638,7 @@ - resultAsync.get()); //run on main thread: - }); +@@ -5669,6 +5671,7 @@ } -+ */ + else + showNewVersionReminder(); ++ */ } -diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/version_check.cpp 11.1-1/FreeFileSync/Source/ui/version_check.cpp ---- 11.1-0/FreeFileSync/Source/ui/version_check.cpp 2020-08-31 20:04:21.573862614 -0400 -+++ 11.1-1/FreeFileSync/Source/ui/version_check.cpp 2020-08-31 20:48:08.102811585 -0400 +diff -aur 11.2-0/FreeFileSync/Source/ui/version_check.cpp 11.2-1/FreeFileSync/Source/ui/version_check.cpp +--- 11.2-0/FreeFileSync/Source/ui/version_check.cpp 2020-10-02 14:39:05.297463367 -0400 ++++ 11.2-1/FreeFileSync/Source/ui/version_check.cpp 2020-10-02 14:55:17.857457477 -0400 @@ -70,6 +70,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -46,17 +46,17 @@ diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/version_check.cp if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -155,8 +157,7 @@ +@@ -156,8 +158,7 @@ + std::wstring updateDetailsMsg; + try { - try - { -- const std::string buf = sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })), -- ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll(); //throw SysError -+ const std::string buf = ""; - updateDetailsMsg = utfTo<std::wstring>(buf); - } - catch (const SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); } -@@ -185,8 +186,7 @@ +- updateDetailsMsg = utfTo<std::wstring>(sendHttpGet(utfTo<Zstring>("https://api.freefilesync.org/latest_changes?" + xWwwFormUrlEncode({ { "since", ffsVersion } })), +- ffsUpdateCheckUserAgent, nullptr /*caCertFilePath*/, nullptr /*notifyUnbufferedIO*/).readAll()); //throw SysError ++ updateDetailsMsg = utfTo<std::wstring>(""); + } + catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); } + +@@ -178,8 +179,7 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { @@ -66,7 +66,7 @@ diff -x '*.orig' -x '*.rej' -Naur 11.1-0/FreeFileSync/Source/ui/version_check.cp return trimCpy(response); } -@@ -233,13 +233,13 @@ +@@ -226,13 +226,13 @@ const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError lastOnlineVersion = onlineVersion; |