diff options
| author | B Stack <bgstack15@gmail.com> | 2020-06-26 20:05:53 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-06-26 20:05:53 +0000 |
| commit | adedcec62e0bb184930af3d812e78cfd279abcf3 (patch) | |
| tree | 3dd5641a2a1b473d26e16f19eaefcc3144984fba /freefilesync/ffs_no_wx311.patch | |
| parent | Merge branch 'irfanview-bump' into 'master' (diff) | |
| parent | ffs dpkg gtk2 build (diff) | |
| download | stackrpms-adedcec62e0bb184930af3d812e78cfd279abcf3.tar.gz stackrpms-adedcec62e0bb184930af3d812e78cfd279abcf3.tar.bz2 stackrpms-adedcec62e0bb184930af3d812e78cfd279abcf3.zip | |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 10.25
See merge request bgstack15/stackrpms!164
Diffstat (limited to 'freefilesync/ffs_no_wx311.patch')
| -rw-r--r-- | freefilesync/ffs_no_wx311.patch | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index f617122..926f7b8 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -1,8 +1,18 @@ 2019-08-15 just compile. -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 07:56:06.714625467 -0500 -+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 08:41:43.498308243 -0500 -@@ -1546,7 +1546,7 @@ +diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp +--- 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-19 16:17:15.000000000 -0400 ++++ 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-20 14:23:47.488836409 -0400 +@@ -293,7 +293,8 @@ + { + showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); + } +- m_listBoxGdriveUsers->Append(gdriveAccounts); ++ for (const wxString& item : gdriveAccounts) // reverted to pre-wx 3.1.1 logic ++ m_listBoxGdriveUsers->Append(item); + + //set default values for Google Drive: use first item of m_listBoxGdriveUsers + if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase)) +@@ -1663,7 +1664,7 @@ //setMainInstructionFont(*m_staticTextMain); m_bitmapActivation->SetBitmap(getResourceImage("internet")); |