Merge branch 'freefilesync-bump' into 'master'

Freefilesync bump

See merge request bgstack15/stackrpms!320

1 files changed, 12 insertions, 12 deletions

diff --git a/freefilesync/01_no_check_updates.patch b/freefilesync/01_no_check_updates.patch
index c3e5d55..956b476 100644
--- a/freefilesync/01_no_check_updates.patch
+++ b/freefilesync/01_no_check_updates.patch
@@ -1,5 +1,5 @@
-Version: 11.23
-Date: 2022-08-03
+Version: 11.25
+Date: 2022-09-07
 Author: bgstack15
 Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program.
 --- a/FreeFileSync/Source/ui/gui_generated.cpp
@@ -20,15 +20,15 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL );
      m_menuHelp->Append( m_menuItemAbout );
  
-@@ -1131,8 +1122,6 @@ MainDialogGenerated::MainDialogGenerated
+@@ -1132,8 +1123,6 @@
      m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId());
      m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId());
      m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId());
 -    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId());
 -    m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId());
      m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId());
-     m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this );
-     m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
+     m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCompare ), NULL, this );
+     m_buttonCompare->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this );
 --- a/FreeFileSync/Source/ui/gui_generated.h
 +++ b/FreeFileSync/Source/ui/gui_generated.h
 @@ -96,8 +96,6 @@ protected:
@@ -170,9 +170,9 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      void onMenuAbout          (wxCommandEvent& event) override;
      void onShowHelp           (wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://freefilesync.org/manual.php?topic=freefilesync"); }
      void onMenuQuit           (wxCommandEvent& event) override { Close(); }
---- a/FreeFileSync/Source/ui/version_check.cpp
-+++ b/FreeFileSync/Source/ui/version_check.cpp
-@@ -73,6 +73,8 @@ time_t getVersionCheckCurrentTime()
+--- 11.25-0/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 14:54:31.556630130 -0400
++++ 11.25-1/FreeFileSync/Source/ui/version_check.cpp	2022-09-07 15:24:11.648682649 -0400
+@@ -79,6 +79,8 @@
  
  bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck)
  {
@@ -181,7 +181,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      if (lastUpdateCheck == getVersionCheckInactiveId())
          return false;
  
-@@ -151,8 +153,7 @@ void showUpdateAvailableDialog(wxWindow*
+@@ -168,8 +170,7 @@
      std::wstring updateDetailsMsg;
      try
      {
@@ -191,7 +191,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
      }
      catch (const SysError& e) { updateDetailsMsg = _("Failed to retrieve update information.") + + L"\n\n" + e.toString(); }
  
-@@ -175,8 +176,8 @@ void showUpdateAvailableDialog(wxWindow*
+@@ -191,8 +192,8 @@
  
  std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError
  {
@@ -202,7 +202,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
  
      if (response.empty() ||
      !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
-@@ -223,58 +224,6 @@ void fff::disableUpdateCheck(time_t& las
+@@ -239,58 +240,6 @@
  }
  
  
@@ -233,7 +233,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
 -                                           setDetailInstructions(e.toString()), _("&Check"), _("&Retry")))
 -            {
 -                case ConfirmationButton2::accept:
--                    wxLaunchDefaultBrowser(L"https://freefilesync.org/get_latest.php");
+-                    openBrowserForDownload(&parent);
 -                    break;
 -                case ConfirmationButton2::accept2: //retry
 -                    checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!!