Eric Schirra
37bf3bcad1
update to 9.2 OBS-URL: https://build.opensuse.org/request/show/511046 OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=23
71 lines
3.0 KiB
Diff
71 lines
3.0 KiB
Diff
Index: FreeFileSync-9.2/FreeFileSync/Source/fs/abstract.h
|
|
===================================================================
|
|
--- FreeFileSync-9.2.orig/FreeFileSync/Source/fs/abstract.h
|
|
+++ FreeFileSync-9.2/FreeFileSync/Source/fs/abstract.h
|
|
@@ -12,6 +12,7 @@
|
|
#include <zen/zstring.h>
|
|
#include <zen/optional.h>
|
|
#include <zen/serialize.h> //InputStream/OutputStream support buffered stream concept
|
|
+#include <zen/warn_static.h>
|
|
#include "../lib/icon_holder.h"
|
|
|
|
|
|
Index: FreeFileSync-9.2/FreeFileSync/Source/Makefile
|
|
===================================================================
|
|
--- FreeFileSync-9.2.orig/FreeFileSync/Source/Makefile
|
|
+++ FreeFileSync-9.2/FreeFileSync/Source/Makefile
|
|
@@ -121,5 +121,5 @@ install:
|
|
$(APPSHAREDIR)
|
|
|
|
mkdir -p $(DOCSHAREDIR)
|
|
- cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog
|
|
+ cp ../../Changelog.txt $(DOCSHAREDIR)/changelog
|
|
gzip $(DOCSHAREDIR)/changelog
|
|
Index: FreeFileSync-9.2/FreeFileSync/Source/ui/main_dlg.cpp
|
|
===================================================================
|
|
--- FreeFileSync-9.2.orig/FreeFileSync/Source/ui/main_dlg.cpp
|
|
+++ FreeFileSync-9.2/FreeFileSync/Source/ui/main_dlg.cpp
|
|
@@ -984,7 +984,7 @@ xmlAccess::XmlGlobalSettings MainDialog:
|
|
history.resize(globalSettings.gui.cfgFileHistMax);
|
|
|
|
globalSettings.gui.cfgFileHistory = history;
|
|
- globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
|
|
+ // globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
|
|
//--------------------------------------------------------------------------------
|
|
globalSettings.gui.lastUsedConfigFiles.clear();
|
|
for (const Zstring& cfgFilePath : activeConfigFiles_)
|
|
@@ -4821,13 +4821,13 @@ void MainDialog::OnMenuCheckVersionAutom
|
|
|
|
m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck));
|
|
|
|
- if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
+ /*if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
{
|
|
flashStatusInformation(_("Searching for program updates..."));
|
|
//synchronous update check is sufficient here:
|
|
periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
|
|
periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get());
|
|
- }
|
|
+ }*/
|
|
}
|
|
|
|
|
|
@@ -4836,7 +4836,7 @@ void MainDialog::OnRegularUpdateCheck(wx
|
|
//execute just once per startup!
|
|
Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
|
|
|
|
- if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
+ /*if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck))
|
|
{
|
|
flashStatusInformation(_("Searching for program updates..."));
|
|
|
|
@@ -4848,7 +4848,7 @@ void MainDialog::OnRegularUpdateCheck(wx
|
|
periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion,
|
|
resultAsync.get()); //run on main thread:
|
|
});
|
|
- }
|
|
+ }*/
|
|
}
|
|
|
|
|