smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7033 from symless/SYNERGY-928-Wrong-encoding-from-macos

Browse source 
SYNERGY-928 Wrong encoding form macOS
This commit is contained in:
Andrey Batyiev 2021-06-09 17:49:42 +03:00 committed by GitHub
commit 974652494a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -6,7 +6,7 @@ Bug fixes:
- #7012 Fix natural horizontal scrolling on Mac client - #7012 Fix natural horizontal scrolling on Mac client
- #6997 Allow Windows to go to sleep depending on system preferences - #6997 Allow Windows to go to sleep depending on system preferences
- #7001 Add option to prevent computer from going to sleep - #7001 Add option to prevent computer from going to sleep
- #7029 Wrong encoding for text copied between linux and windows - #7029 | #7033 Wrong encoding for text copied between linux and windows
- #7015 Fix Windows service not starting up after sleep - #7015 Fix Windows service not starting up after sleep
Enhancements: Enhancements:

13
src/lib/platform/OSXClipboardHTMLConverter.cpp
View file

@ -83,13 +83,18 @@ OSXClipboardHTMLConverter::convertString(
String String
OSXClipboardHTMLConverter::doFromIClipboard(const String& data) const OSXClipboardHTMLConverter::doFromIClipboard(const String& data) const
{ {
return convertString(data, kCFStringEncodingUTF8, return data;
CFStringGetSystemEncoding());
} }
String String
OSXClipboardHTMLConverter::doToIClipboard(const String& data) const OSXClipboardHTMLConverter::doToIClipboard(const String& data) const
{ {
return convertString(data, CFStringGetSystemEncoding(), if (Unicode::isUTF8(data))
kCFStringEncodingUTF8); {
return data;
}
else
{
return convertString(data, CFStringGetSystemEncoding(), kCFStringEncodingUTF8);
}
} }