summarylogtreecommitdiffstats
path: root/revert_xdg_config_path.patch
diff options
context:
space:
mode:
Diffstat (limited to 'revert_xdg_config_path.patch')
-rw-r--r--revert_xdg_config_path.patch25
1 files changed, 11 insertions, 14 deletions
diff --git a/revert_xdg_config_path.patch b/revert_xdg_config_path.patch
index 8be48f790d67..570faffef418 100644
--- a/revert_xdg_config_path.patch
+++ b/revert_xdg_config_path.patch
@@ -1,15 +1,12 @@
-diff -r -u2 a/FreeFileSync/Source/base/ffs_paths.cpp b/FreeFileSync/Source/base/ffs_paths.cpp
---- a/FreeFileSync/Source/base/ffs_paths.cpp 2018-12-12 15:02:09.000000000 +0100
-+++ b/FreeFileSync/Source/base/ffs_paths.cpp 2019-01-03 00:56:19.364918282 +0100
-@@ -83,9 +83,7 @@
- if (isPortableVersion())
- cfgFolderPath = getExeFolderParentPath();
-- else //OS standard path (XDG layout): ~/.config/FreeFileSync
-+ else //OS standard path (classic layout): ~/.FreeFileSync
- {
-- //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
-- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
-- cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
-+ cfgFolderPath = utfTo<Zstring>(wxStandardPaths::Get().GetUserDataDir());
- }
+--- a/FreeFileSync/Source/base/ffs_paths.cpp 2019-06-13 20:39:40.000000000 +0200
++++ b/FreeFileSync/Source/base/ffs_paths.cpp 2019-06-17 08:28:10.960031518 +0200
+@@ -73,9 +73,6 @@
+ ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
+- Zstring cfgFolderPath;
+- //OS standard path (XDG layout): ~/.config/FreeFileSync
+- //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
+- wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
+- cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
++ //OS standard path (classic layout): ~/.FreeFileSync
++ Zstring cfgFolderPath = utfTo<Zstring>(wxStandardPaths::Get().GetUserDataDir());