3067560f7b
Fix indentations
2016-03-15 12:57:04 -07:00
ee20d08080
Revert "Revert "Fixed using wrong local variable #4723 ""
...
This reverts commit a0beae0f4b5578a16178e6324f2d1f588caeb442.
2016-03-15 12:51:42 -07:00
5fae9efe78
Revert "Revert "Added timeout for waiting active destop result #4723 ""
...
This reverts commit 0f8a5687719605af59d901f08dfbb5dde74a7dc9.
2016-03-15 12:51:42 -07:00
eb36db6c26
Revert "Revert "Fix missing DLLs after install #3774 ""
...
This reverts commit b575d7ca35d51d1c28ffb84b19fdf96fc941fe41.
2016-03-15 12:51:42 -07:00
2fb36c4f86
Revert "Revert "workaround for Fast cursor on any client with Mac server #451 ""
...
This reverts commit 6470240379c896ee13ee98b9a8c951d22f4351c1.
2016-03-15 12:51:22 -07:00
6f904e55f1
Minor cosmetic change - missing some debug stuff in this branch.
2016-03-15 12:47:34 -07:00
bab2e985a3
Revert to old behavior of checkDesk(), add workaround to broken EnumClipboardFormats() in the case where the server is started while the screen saver is active.
2016-03-15 12:47:33 -07:00
425fc8b925
Refactor Issue #5041 workaround to make sure we still send the SCREENSAVER message
2016-03-15 12:47:33 -07:00
9036d42469
Issue #5041 - properly update activeDesk and activeDeskName when screen saver activates
...
Ensure that we actually kill the server if we go from screen saver desk to real
desk.
2016-03-15 12:47:33 -07:00
1fc28392d0
Add error message to help debug Issue #5041
2016-03-15 12:47:33 -07:00
3e37518b92
Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates
...
When it is restarted, and screen saver is active, the clipboard no longer works
correctly.
The desk swap detection routine just below does not work properly when the
desktop goes from screensaver back to normal. If it did, probably this
workaround would not be needed.
2016-03-15 12:47:33 -07:00
48069f1a3b
Always call wait() at least once even if timeout is 0 to prevent deadlocks
2016-03-15 12:46:45 -07:00
b85b9125ea
Remove inadvertent additions
2016-03-15 12:46:45 -07:00
8f0530c507
Add retry to CondVarBase wait(), make sure Stopwatch is started on construction (Issue #4735 )
...
* ArchMultithreadPosix::waitCondVar() returns every 100ms, so retry until we
hit timeout.
* Stopwatch constructor should be called with "false" (not "true") to make sure
Stopwatch is actually running when instantiated.
2016-03-15 12:46:45 -07:00
1fde0f3e71
Cosmetic whitespace, use return value of wait() directly instead of testing timer
2016-03-15 12:46:45 -07:00
0d310a8464
Properly lock condVar, add timeout condition to prevent infinite loop when waiting for fillClipboard() to finish
2016-03-15 12:46:45 -07:00
6c11de6a22
Fix bug #4735 - don't leave() until fillClipboard()s all complete
2016-03-15 12:46:45 -07:00
0207b697e3
Remove debug logging #5030
2015-11-30 12:01:00 -08:00
42f201785c
Revert "Added timeout for waiting active destop result #4723 "
...
This reverts commit aec52c36e6
2015-11-24 11:53:38 -08:00
539ac32136
Revert "Fixed using wrong local variable #4723 "
...
This reverts commit d7063a87c8
2015-11-24 11:53:18 -08:00
622045b396
Revert "Revert "Revert "Fix missing DLLs after install #3774 """
...
This reverts commit 3eb04d1b4c
2015-11-24 11:42:17 -08:00
8a2106a09e
Revert "workaround for Fast cursor on any client with Mac server #451 "
...
This reverts commit 267f3ac41f
2015-11-24 11:40:04 -08:00
3bca8deac3
Use secure URL #4715
2015-11-23 11:42:47 -08:00
953ad5bc4a
Use live URL #4715
2015-11-23 10:03:44 -08:00
fbd2c1413e
Merge branch 'jerry-sandbox2'
2015-11-23 09:54:05 -08:00
5a03ece50b
Update MacOS warning
2015-11-20 01:35:23 -06:00
fa8a0ebbfe
Make center point be aware of DPI scaling #5030
2015-11-19 13:46:48 -08:00
df89859400
Fix indentation
2015-11-19 13:46:48 -08:00
c259af9b41
Fix code style
2015-11-19 13:46:48 -08:00
4f1f2dcff0
Use condition instead of assertion #5030
2015-11-19 13:46:48 -08:00
ebec92fd5b
Fix unit test failed compiling on Linux #5030
2015-11-19 13:46:47 -08:00
af305ba3df
Add size_t dependency #5030
2015-11-19 13:46:47 -08:00
c23d443a9a
Add unit tests for DpiHelper
2015-11-19 13:46:47 -08:00
0cc831b2fb
Fix code style
2015-11-19 13:46:46 -08:00
c994b0a4f7
Make sure all variables are non zero #5030
2015-11-19 13:46:46 -08:00
a09bfc5f07
Fix high DPI breaking edge detection and mouse delta calculation #5030
2015-11-19 13:46:46 -08:00
66335cd6f8
Pass resolution and center into core on Windows #5030
2015-11-19 13:46:45 -08:00
1ccc258455
Add DPI helper #5030
2015-11-19 13:46:45 -08:00
4be852c2f2
Move notify into thread #4932
2015-11-19 10:48:11 -08:00
e1e38bd3a2
Compress network error during notification #4932
2015-11-19 10:01:50 -08:00
4b2fc8c4c9
Refactor function name #4715
2015-11-18 16:05:08 -08:00
cab8a99233
Persist Profile folder #4715
2015-11-18 16:03:32 -08:00
0e58bfc5fe
Remove user token #4715
2015-11-18 15:09:09 -08:00
b1c5a83bfb
Uthe edition value in app config as default #4715
2015-11-18 15:05:05 -08:00
20d4d47648
Save edition type to settings after wizard finish #4715
2015-11-18 15:03:06 -08:00
4698394e21
URL encode identity and MAC address
2015-11-18 11:51:45 -08:00
5f73d339aa
Refactor purchase url #4716
2015-11-17 15:20:22 -08:00
7ecc0457e0
Show subscription warning once a day #4716
2015-11-17 14:51:04 -08:00
f8e9047c36
Rephrase and refactor serial warning message #4716
2015-11-17 14:17:00 -08:00
18d23d6f89
Rephrase using serial recommendation #5020
2015-11-17 10:41:24 -08:00
97809f9040
Revert "Modify regex to recognize edition from jason #4933 "
...
This reverts commit 2fd0d5c68f
2015-11-16 09:24:49 -08:00
2fd0d5c68f
Modify regex to recognize edition from jason #4933
2015-11-13 11:04:23 -08:00
ad16599fa5
Fix code style
2015-11-12 12:05:37 -08:00
4b7796d215
Catch exception from notification request #4932
2015-11-12 12:05:26 -08:00
8c4ccdf148
Unit test for new fields in serial key #4715
2015-11-12 10:08:55 -08:00
55df81b1a6
Add company and email into serial key #4715
2015-11-12 10:08:35 -08:00
9eec299278
Check user type from serial key #4715
2015-11-12 09:50:30 -08:00
4c1b6f3f23
Use test website #4932
2015-10-30 13:49:18 -07:00
10e3917b61
Change notify failure log level #4932
2015-10-30 13:42:05 -07:00
382607129c
Make notify failure silent #4932
2015-10-30 12:43:28 -07:00
bdc02677ec
Add trial edition type #4716
2015-10-30 11:57:12 -07:00
73ac3df22d
Limit expired time to trial version #4716
2015-10-30 11:41:51 -07:00
068b3b98ed
Fix compile warnning #4933
2015-10-30 11:25:16 -07:00
0a1c439535
Only send notify request on wizard finish #4932
2015-10-29 16:50:23 -07:00
f03b453c6f
Pass Linux OS info during notification #4932
2015-10-29 15:55:55 -07:00
b4563a42c4
Use string split function in syntool #4933
2015-10-29 15:47:10 -07:00
942dcabdcd
Add split empty string unit test #4933
2015-10-29 15:11:09 -07:00
c148fbb7f4
Fix unit tests name convention #4933
2015-10-29 13:08:00 -07:00
d429988e73
Add more unit tests for split string function #4933
2015-10-29 13:00:03 -07:00
1b73b8875b
Add unit tests for split string function #4933
2015-10-29 12:53:15 -07:00
72397137c0
Add split string function #4933
2015-10-29 12:52:55 -07:00
27f83e1801
Refactor duplicated code #4933
2015-10-29 11:42:16 -07:00
582629e968
Use the passed in OS info if specified #4933
2015-10-28 17:29:42 -07:00
2535f3466c
Check OS info from GUI #4933
2015-10-28 17:15:16 -07:00
d4d5d83bb6
Check OS info from GUI #4933
2015-10-28 14:09:04 -07:00
a4c799c285
Notify activation when skipping or using serial #4932
2015-10-27 16:31:09 -07:00
4d20a3ce91
Add OS and arch in auth request #4933
2015-10-27 15:50:34 -07:00
32da441fc0
Simplify OS info on Unix #4933
2015-10-27 15:45:39 -07:00
19835b6aaa
Allow software to be time limited with serial key #4716
2015-10-23 15:37:16 -07:00
75adb5aa8d
Recommend using serial key when online activation fails #5020
2015-10-23 12:13:16 -07:00
98385c06e9
Use local variable instead of function parameter #5020
2015-10-23 11:59:28 -07:00
da315ec164
Add unit tests for subscription manager #4715
2015-10-23 11:35:58 -07:00
978c97cbc0
Refactor parse plain serial #4715
2015-10-23 11:35:57 -07:00
0429986470
Add dependency for Linux #4715
2015-10-22 16:41:48 -07:00
bc768cbca3
Add serial key in app settings #4715
2015-10-22 16:31:46 -07:00
3bc46dca2d
Use core interface to activate subscription in wizard #4715
2015-10-22 16:14:37 -07:00
85ef7935cc
Rename a variable
2015-10-22 16:04:05 -07:00
1f54dd2d3b
Remove unused code
2015-10-22 16:03:27 -07:00
ca0237dcc7
Remove legacy subscription checking #4715
2015-10-21 17:48:44 -07:00
a29858c439
Add subscription section in activation page #4715
2015-10-21 17:06:38 -07:00
18e7004213
Add subscription functionalities in syntool #4715
2015-10-21 16:35:22 -07:00
8f941f5713
Port subscription feature #4715
2015-10-21 16:00:23 -07:00
83876ebed4
Removed legacy class #4696
2015-10-20 14:36:28 -07:00
084e2c1e05
Refactor FileSysClient into PluginManager #4696
2015-10-19 18:07:08 -07:00
6c4ee29649
Remove unused functions in WebClient #4696
2015-10-19 17:02:59 -07:00
4197fb7a0e
Remove unused viable #4696
2015-10-19 16:59:25 -07:00
d61b532705
Add built date #4893
2015-10-19 16:06:02 -07:00
6320156279
Add stage and revision info in about page #4893
2015-10-19 15:15:03 -07:00
5da7290242
Stopped process before showing the fingerprint message #4901
2015-08-10 10:11:51 -07:00
d2c94bfb04
Revert "Removed mutex locking from get and set of log level #4809 "
...
This reverts commit 3eef49d5c9
2015-08-06 12:57:57 -07:00
9b09703c1a
Revert "Allowed reconnect after SSL fatal error #4857 "
...
This reverts commit cbd63e9d67ead4199d5ab49b17d68a7583421d92.
2015-08-06 12:55:59 -07:00
95c9ffe7e8
Removed unused variable #4866
2015-08-03 16:38:42 -07:00
5b1e7acca9
Plugin version to 1.3
2015-08-03 16:29:36 -07:00
c55cf1936b
Added plugin version header in GUI project #4866
2015-08-03 16:28:13 -07:00
0f4837aa21
Fixed warning on Mac 10.6 #4866
2015-08-03 15:56:39 -07:00
945ccfdb75
Refactored plugin names #4866
2015-08-03 15:56:21 -07:00
b105bc8f42
Unified secure socket name across platforms #4866
2015-08-03 15:56:03 -07:00
fedad2b8a1
Improved plugin version logging for Unix #4866
2015-08-03 15:55:37 -07:00
3eb1bffb70
Improved variable name for plugin loading on Windows #4866
2015-08-03 15:51:53 -07:00
cb5f0f7b12
Improved plugin version logging for Windows #4866
...
Conflicts:
src/lib/arch/win32/ArchPluginWindows.cpp
2015-08-03 15:51:27 -07:00
bfabd436d7
Increased wizard version to force plugin download #4866
2015-08-03 15:48:44 -07:00
dc72b4e512
Changed plugin version mismatch log level to error #4866
2015-08-03 15:46:47 -07:00
6602ebe435
Refactored adding plugin only after loaded #4866
...
Conflicts:
src/lib/arch/unix/ArchPluginUnix.cpp
2015-08-03 15:45:31 -07:00
a99699df7a
Only loaded matching plugin on Mac #4866
...
Conflicts:
src/lib/arch/unix/ArchPluginUnix.cpp
2015-08-03 15:43:54 -07:00
a249c38b96
Only loaded matching plugin on Windows #4866
...
Conflicts:
src/gui/gui.pro
src/gui/src/PluginManager.cpp
src/lib/arch/win32/ArchPluginWindows.cpp
2015-08-03 15:41:57 -07:00
02902066a4
Removed the usage of old delay in GUI #4696
2015-07-31 14:15:28 -07:00
dbdc2a1e29
Solved fingerprint message box race condition #4901
2015-07-31 14:00:26 -07:00
0612ba585d
Stopped multiple fingerprint message boxes popping up #4910
2015-07-31 14:00:26 -07:00
d70c19b099
Stopped old process before start a new one #4908
2015-07-31 14:00:26 -07:00
e472e47815
Stopped old process on apply button clicked #4908
2015-07-31 14:00:26 -07:00
20cb624c3b
Used timer instead of delay #4901
2015-07-31 13:59:25 -07:00
08effbcf99
Fixed code style #4901
2015-07-31 13:59:25 -07:00
67fbecb825
Fixed auto restart sometimes cause GUI crash #4901
2015-07-31 13:59:01 -07:00
94664e413b
Rename update zeroconf mutex
2015-07-31 13:58:47 -07:00
fc600efdfe
Restarted process from GUI in desktop mode #4901
2015-07-31 13:58:18 -07:00
86d5567e74
Removed redundant logging #4721
2015-07-31 13:57:18 -07:00
5d61996405
Fixed code style #4712
2015-07-31 13:56:58 -07:00
1659f9f018
Added keep alive massge before each data transfer #4712
2015-07-31 13:56:33 -07:00
de49b46edd
Expected hasClients at least 3 times #4721
2015-07-31 13:56:19 -07:00
9d44affc89
Fixed Ipc unit test intermittently fail #4721
2015-07-31 13:56:10 -07:00
1369f46cee
Show connected message box only when main GUI is visible #4850
2015-07-31 13:55:52 -07:00
7259e71439
Reset thread back to null on finish #4712
2015-07-31 13:55:35 -07:00
bfc3ac340f
Fixed possible loss of data warning #4677
2015-07-31 13:55:23 -07:00
a5c865913f
Added expect call time for hasClients #4721
2015-07-31 13:55:09 -07:00
c3d38db053
Made buffer thread wait for notify when no gui #4721
2015-07-31 13:55:00 -07:00
18a6f75371
Fixed dialog too big #4852
2015-07-31 13:54:26 -07:00
516c692c94
Removed unused function #4745
2015-07-31 13:54:09 -07:00
5ec9ccc76e
Revert "Made buffer thread wait until there is a GUI client #4721 "
...
This reverts commit 9a4327e44236c0ac30809660dc87a97e984dc84f.
2015-07-31 13:52:56 -07:00
01526bbe78
Revert "Removed unrelated checking #4721 "
...
This reverts commit 2de276cfca71a79df31a1d4a89d412212279a1a5.
2015-07-31 13:52:47 -07:00
5a9cbc97e3
Fixed code style
...
Conflicts:
src/lib/arch/win32/ArchPluginWindows.cpp
2015-07-31 13:51:48 -07:00
88214a0d3c
Removed unrelated checking #4721
2015-07-31 13:49:42 -07:00
afdcb9cefe
Made buffer thread wait until there is a GUI client #4721
...
Conflicts:
src/lib/ipc/IpcLogOutputter.cpp
2015-07-31 13:49:17 -07:00
cc3dc315f9
Allowed reconnect after SSL fatal error #4857
2015-07-31 13:46:35 -07:00
a44e9832c5
Refactored code order to make it more readable
2015-07-31 13:46:23 -07:00
9800bec857
Made clipboard log more consistent #4712
2015-07-31 13:46:11 -07:00
c2b96cfbb7
Updated comment #4750
2015-07-31 13:45:46 -07:00
d51eb7b8b5
Fixed code style
2015-07-31 13:42:51 -07:00
f8bb948776
Removed unused variable #4750
2015-07-31 13:42:41 -07:00
0ddf544efb
Used static variable than define #4750
...
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
2015-07-31 13:25:03 -07:00
44966ee17f
Removed redundant log #4858
2015-07-31 13:22:50 -07:00
4fe46e117e
Shorten data transfer log #4858
2015-07-31 13:20:50 -07:00
485547d6ea
Reverted Notify back to note #4855
2015-07-31 13:20:35 -07:00
81649376fa
Revert "Added symbolic link creation to linux and macos #4696 "
...
This reverts commit ad9cfd64af
2015-07-31 13:20:16 -07:00
a8cf9173c8
Revert "Changed note to notify #4745 "
...
This reverts commit 5006adedfe
2015-07-31 13:19:17 -07:00
69a6038cf9
Revert "Moved note into either warning or info #4745 "
...
This reverts commit d3a4ce1f11
2015-07-31 13:18:57 -07:00
d8582d1093
Revert "Removed warning and error logging level in GUI #4745 "
...
This reverts commit 756000d8a9
2015-07-31 13:18:36 -07:00
c89dc68cd7
Revert "Added warning for enable encryption #4584 "
...
This reverts commit 8e15b77db3
2015-07-31 13:17:36 -07:00
9483fecc42
Fixed code style
...
Revert "Moved note into either warning or info #4745 "
This reverts
commit d3a4ce1f11#4745 "
This reverts commit
5006adedfe#4858
Revert "Added code to throw an error if the plugin can't be deleted or
written to #4696 "
This reverts commit
5696497bc0
2015-07-31 13:17:12 -07:00
8ff44d276b
Revert "Revert "Add drag and drop enable option to GUI settings""
...
This reverts commit 8676f64b96
2015-07-09 17:05:43 -07:00
3eb04d1b4c
Revert "Revert "Fix missing DLLs after install #3774 ""
...
This reverts commit 7254e621e1
2015-07-09 17:05:33 -07:00
7254e621e1
Revert "Fix missing DLLs after install #3774 "
2015-07-09 10:00:02 -07:00
8676f64b96
Revert "Add drag and drop enable option to GUI settings"
2015-07-09 09:54:57 -07:00
cfec3a93f2
Fixed code style
2015-07-06 16:48:36 -07:00
260a7337d3
Added timestamp in log #4845
2015-07-06 15:50:21 -07:00
23739f8484
Prevented open clipboard twice #4815
2015-07-06 13:00:28 -07:00
8a026e06bd
Merge remote-tracking branch 'origin/v1.7.4-stable'
2015-06-30 15:43:39 -07:00
44fa44fd1b
Fixed using non existing function #4745
2015-06-30 15:05:24 -07:00
00734c15b1
Removed notify log level in settings #4745
2015-06-30 22:45:48 +01:00
85dc7a566e
Made log consistent #4745
2015-06-30 03:37:36 +01:00
6d5f997a1e
Removed notification but use tray icon #4745
2015-06-30 01:42:08 +01:00
673fba5846
Merge branch 'master' of https://github.com/synergy/synergy
2015-06-25 12:38:33 -07:00
3aebb87b37
Fixed using old log level convention #4745
2015-06-25 11:25:58 -07:00
9dc0a1d862
Added comment for clarity #4750
2015-06-25 09:54:28 -07:00
25c1754d2d
Merge branch 'master' into adam-sandbox
2015-06-25 09:46:21 -07:00
4569de5413
Fixed misplaces statis string in windows code #4793
2015-06-25 09:44:16 -07:00
d7043ef84b
Added plugin version output to unix builds #4793
2015-06-25 09:35:56 -07:00
55a38ff8cc
removed unnecessary flag settings, fixed wrong call. #4750
2015-06-24 17:57:22 -07:00
f10f0f13c4
retry case needs to do another job with the same parameters not just a new job #4750
2015-06-24 16:31:47 -07:00
2df88e07c4
fixed retry logic for secure connect and accept #4750
2015-06-24 12:20:25 -07:00
e50b239592
Changed secure connest and accept to match read/write retry logic #4750
2015-06-24 11:11:20 -07:00
6442bcb8f6
Change PluginWizardPage to take and use MainWindow instead of appConfig #4823
2015-06-23 17:11:39 -07:00
19f5ad8cab
Add delay routine to MainWindow to allow sleep in a Qt friendly way #4823
2015-06-23 17:10:49 -07:00
267f3ac41f
workaround for Fast cursor on any client with Mac server #451
2015-06-19 17:20:26 -07:00
121080be74
removed non-existant file from gui.pro to remove warning #4810
2015-06-18 14:45:41 -07:00
d51e2e4fb1
Merge branch 'v1.7.4-stable' of https://github.com/synergy/synergy into v1.7.4-stable
2015-06-18 14:19:06 -07:00
3eef49d5c9
Removed mutex locking from get and set of log level #4809
2015-06-18 14:18:05 -07:00
f3472c84e2
Show notification only on Debug level or above #4745
2015-06-18 13:50:38 -07:00
14046db32a
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-15 09:59:38 -07:00
667b6f13c7
Enforced secure socket rewrite on the same buffer address #4712
2015-06-12 18:03:28 -07:00
3e32d9fbee
Improved secure socket intensive try operations #4796
2015-06-12 16:53:41 -07:00
9893a018b1
Merge pull request #4634 from sparrowt/sparrowt-issue3774-fix-missing-dlls
...
Fix missing DLLs after install #3774
2015-06-12 16:14:15 -07:00
768445816b
Merge branch 'adam-sandbox'
2015-06-12 16:03:34 -07:00
efab42962f
Merge branch 'master' of https://github.com/synergy/synergy
2015-06-12 16:03:25 -07:00
afb0e2a2ea
Added log level protection, changed log levels for some logging #4793
2015-06-12 15:07:53 -07:00
16a2815504
Added additional SSL logging abotu connection information as well as client and server cipher availability #4793
2015-06-12 14:40:15 -07:00
4b0dec69bf
Added additional SSL logging abotu connection information as well as client and server cipher availability #4793
2015-06-12 14:33:28 -07:00
72060e59b4
Fixed send clipboard thread time issue #4749
2015-06-12 11:21:05 -07:00
1e89aa37c5
Merge pull request #4382 from meowfaceman/master
...
Make drag and drop optional #4327
2015-06-12 19:12:57 +01:00
5696497bc0
Added code to throw an error if the plugin can't be deleted or written to #4696
2015-06-11 17:40:26 -07:00
6bb44fbc59
Merge pull request #4228 from galkinvv/fix2866
...
High client CPU usage and laggy mouse
2015-06-11 16:12:40 -07:00
3942dc6ee8
Added stub code for linux/mac builds to match the functional ARCH code for discovering libraris in use #4793
2015-06-11 10:00:45 -07:00
fa0dfa0ded
Added ability to query lib locations to windows builds
2015-06-10 13:18:39 -07:00
8366bb6247
Added OpenSSL version and location logging
2015-06-10 10:20:59 -07:00
f94e1e1660
Disabled intermittently failing unit test #4651
2015-06-10 07:04:58 -07:00
099c984d7d
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-09 16:05:43 -07:00
f36d257495
Updated the comments
2015-06-09 15:48:08 -07:00
81acb96540
Tried to fix random unittest fail (part2)
2015-06-09 15:33:57 -07:00
0c211e2852
Adding logging output when ssl connects for aid in debugging and support
2015-06-09 14:07:42 -07:00
deb3db93e6
Tried to fix random unittest fail
2015-06-09 13:59:04 -07:00
8e15b77db3
Added warning for enable encryption #4584
2015-06-08 15:39:33 -07:00
756000d8a9
Removed warning and error logging level in GUI #4745
2015-06-08 14:44:31 -07:00
a21e4cd73b
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-08 13:53:01 -07:00
ed37eeca51
Merge branch '4696'
2015-06-08 13:24:47 -07:00
155a8b70c4
Added version string to plugin and added to plugin loaded message
2015-06-05 17:07:47 -07:00
2db2ffac84
Adding Windows Plugins Directory to install #4696
2015-06-05 16:55:36 -07:00
5c71efebe6
Fixed integtests #4584
2015-06-05 15:23:44 -07:00
756c3b4463
Inserted keep alive msg among data transfer #4584
2015-06-05 15:21:32 -07:00
bbf53bb9b8
Return the same job on retry #4584
2015-06-05 15:21:26 -07:00
0680c33909
Added file events #4584
2015-06-05 15:21:17 -07:00
7795d68c21
Removed magic number #4712
2015-06-04 14:46:47 -07:00
eb3f8aee2a
Notified file transmission interrupted #4745
2015-06-04 14:43:49 -07:00
88e5c6197d
Trivial whitespace fix cause by by editor settings
2015-06-04 14:06:17 -07:00
646e1b52eb
Interrupted file transfer when cursor move back #4584
2015-06-04 13:09:48 -07:00
e0903983ad
Validated file expected size #4584
2015-06-04 10:19:36 -07:00
8c64cbf54e
Refactored send drag info on server #4584
2015-06-04 10:04:08 -07:00
78f8fb45ba
Fixed Installed Directory in ARCH for MacOS #4696
2015-06-04 09:58:22 -07:00
ee22e688d5
Removed clipboard ignore notification #4745
2015-06-03 17:32:09 -07:00
d9684d44d2
Added fake drag file list #4584
2015-06-03 16:17:26 -07:00
4508e10186
Fixed IpcLogOutputterTest #4721
2015-06-03 15:23:33 -07:00
7614a21aac
Cleared buffer on send instead of write #4721
2015-06-03 14:45:47 -07:00
c4e8dc7198
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-02 15:30:33 -07:00
ad9cfd64af
Added symbolic link creation to linux and macos #4696
2015-06-02 14:29:01 -07:00
0061969cf2
Updating installed dir for Linux and MacOS #4696
2015-06-02 14:28:20 -07:00
22e8d3d03a
Fixed clipboard transmission messing up start/stop $4745
2015-06-02 13:42:27 -07:00
8d0fdee5ce
Added full stop for notification #4745
2015-06-02 11:18:21 -07:00
f42b756b0e
Added clipboard transmission failed notification #4745
2015-06-02 11:17:04 -07:00
f22d9ac477
Added clipboard transmission start notification #4745
2015-06-02 11:14:28 -07:00
d9921c894c
Added clipboard transmission notification #4745
2015-06-02 09:48:26 -07:00
ce2c797f69
Made code more readable #4745
2015-06-01 16:58:21 -07:00
3d55516fdf
Removed unused code #4745
2015-06-01 16:56:52 -07:00
e784b48711
Added use of Installed Dir for finding plugin install directory #4696
...
Fixed issues with file path creation #4696
2015-06-01 16:50:05 -07:00
c1158ea7f9
Removed speaker and system hard coded locations from code #4696
...
Removed previously commended out code that is unnecessary #4696
2015-06-01 16:48:12 -07:00
4a7fdabd65
Added Installed Dir to PluginManager #4696
2015-06-01 16:46:33 -07:00
5d770d4204
Added getInstallDir to Core Interface #4696
2015-06-01 16:43:57 -07:00
98bb9b3fb3
Added getInstalledDir to ToolApp. #4696
2015-06-01 16:43:27 -07:00
4533063768
Fixed compile error on Unix #4745
2015-06-01 16:04:13 -07:00
bfe616eebe
Added file transmission started notification for server #4745
2015-06-01 16:00:35 -07:00
d1ca021002
Monitoring log to show notification and made icon change while transfering $4745
2015-06-01 15:59:59 -07:00
5cbcd74028
Fixed using NOTE level logging on Mac #4745
2015-06-01 23:42:58 +01:00
e7f358afb2
Added file transmission started, failed and complete notification #4745
2015-06-01 15:33:06 -07:00
5006adedfe
Changed note to notify #4745
2015-06-01 14:46:08 -07:00
d3a4ce1f11
Moved note into either warning or info #4745
2015-06-01 14:31:32 -07:00
ecf0485e8f
Removed commented out code #4745
2015-06-01 12:39:30 -07:00
4a27c0b05c
Added drop file notification on client #4745
2015-06-01 11:57:43 -07:00
bd3a8e9429
Fixed unittest for ipcLogOutputter #4721
2015-05-29 17:48:53 -07:00
97bac70fae
Stop writing into and clear buffer when no GUI #4721
2015-05-29 16:55:22 -07:00
4bf1eeb065
Removed unnecessary method and static data #4696
2015-05-29 16:47:51 -07:00
1229974d2f
Merge branch 'master' into 4696
...
Conflicts:
src/gui/src/PluginManager.cpp
2015-05-29 16:39:31 -07:00
e35fd80cef
Fixed name for Mac and Linux Build #4696
2015-05-29 16:20:47 -07:00
8d70075171
Replaces plugin download with install and copy functionality #4696
2015-05-29 15:57:21 -07:00
9487db1672
Merge pull request #4722 from maximd/master
...
Fix issue synergy/synergy#4720
2015-05-28 16:58:44 -07:00
d7063a87c8
Fixed using wrong local variable #4723
2015-05-27 10:32:13 -07:00
aec52c36e6
Added timeout for waiting active destop result #4723
2015-05-27 10:18:45 -07:00
3498d1bc8e
Used synergy::string::sprintf instead of append #4690
2015-05-27 09:52:58 -07:00
03fc9b5fa7
Fix issue synergy/synergy#4720
2015-05-27 18:34:47 +02:00
d83cb23cc7
Reverted 8b9758 #4712
2015-05-26 17:25:18 -07:00
907b02fb09
Used log system instead of stdout (part 2) #4690
2015-05-26 17:18:14 -07:00
3788084e43
Merge branch 'jerry-sandbox' of https://github.com/synergy/synergy into jerry-sandbox
2015-05-26 17:13:09 -07:00
f063b094ec
Used log system instead of stdout #4690
2015-05-26 17:12:58 -07:00
dba46707b2
Removed SSL chunk size limitation #4712
2015-05-26 13:31:15 -07:00
8b975878c2
Limited clipboard size to 1kb when SSL is enabled #4601
...
@XinyuHou I had no choice but to block clipboard data over 1kb in
size... anything over that and you get an access violation.
2015-05-26 15:04:04 +01:00
fd72bf17ce
Reworded SSL errors to be more consistent #4650
2015-05-26 14:17:30 +01:00
42ed1c2f27
Increased ssl error rate limit from 50k to 100k #4650
...
@speaker This is nuts... my mac client now errors 50k times before it
eventually connects.
2015-05-26 14:14:24 +01:00
3dc3d5b309
Increased ssl error rate limit from 60 to 50000 #4650
...
@speaker, a 50k limit seems a bit insane, but it seems to be the only
way to get my Mac client to establish a connection :-/
2015-05-26 14:00:50 +01:00
e96cead732
Fixed wrong sprintf specifier used (%s instead of %d) #4650
...
My bad, I was being carless in 4aa57cfbdb
2015-05-26 12:19:13 +01:00
4aa57cfbdb
Fixed code style, more consistent logging #4650
2015-05-25 20:24:29 +01:00
1cea4bb80f
Fixed code style, use lower case for logging #4650
2015-05-25 20:20:12 +01:00
0fdcfe9b95
Fixed code style, prefer enums over macros #4650
2015-05-25 20:20:12 +01:00
3563217c7b
Fixed Mac package platform variable name #4708
2015-05-25 19:54:34 +01:00
590d0482b3
Removed useless processor type return for Mac #4708
2015-05-25 19:54:21 +01:00
e8a43dd020
Simplified logic to detect Linux 64/32 deb/rpm #4565
2015-05-25 19:41:53 +01:00
e479f16705
Incremented default plugin version to 1.1
2015-05-25 18:59:58 +01:00
cae767735c
Download specific plugin version on Mac #4708
2015-05-25 18:59:58 +01:00
14bb44f539
Comment explaining lack of 10.7 support #4695
2015-05-25 17:41:38 +01:00
25237a14b7
Revert "Allowed Mac OS X 10.7 to build ns plugin #4695 "
...
This reverts commit a900543c1d
2015-05-25 17:40:36 +01:00
a900543c1d
Allowed Mac OS X 10.7 to build ns plugin #4695
2015-05-25 16:53:46 +01:00
b71c298163
Changed sleep time to 100ms for unit test (hack) #4651
2015-05-25 15:25:14 +01:00
18344e6b52
Copy ns plugin to debug dir when in debug mode #4704
2015-05-25 13:08:47 +01:00
f322a79760
Copy plugins to config dir on Mac #4703
2015-05-25 13:07:36 +01:00
b1f2abbaae
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 16:39:33 -07:00
fb3252efef
Added a way to interrupt sending clipboard/file #4601
2015-05-23 00:34:00 +01:00
905dbfee90
Fixed order of initializers for mac build #4697
2015-05-22 16:26:40 -07:00
773530506e
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-22 16:10:29 -07:00
35e09c46b9
Changed secureSocket routines to return a status, and modify an argument for num of bytes handled #4697
2015-05-22 16:09:59 -07:00
ff9ad5554a
Used different chunk size for SSL and non-SSL socket #4601
2015-05-22 13:30:50 -07:00
36ddc4f1c1
Fixed indentation
2015-05-22 13:10:22 -07:00
625feab104
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 12:40:24 -07:00
c1d859e35a
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 11:28:39 -07:00
a81b88c730
Refactored file assemble and send code #4601
2015-05-22 11:27:57 -07:00
7b718dc586
Forgot to change linux specific variable name #4697
2015-05-22 11:17:10 -07:00
86ad2bf080
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-22 10:56:33 -07:00
5b3fa48902
Made socket self-aware of when it is in a fatal state #4697
...
Added code to cleanly terminate connection on fatal socket state #4697
2015-05-22 10:56:13 -07:00
1df566d241
Refactored duplicated code #4601
2015-05-21 17:50:55 -07:00
1c28444cf6
Refactored duplicated code #4601
2015-05-21 16:04:50 -07:00
342a345d1f
Fixed code style
2015-05-21 15:35:36 -07:00
257c19ecc4
Deprecated and moved clipboard functionality into new protocol #4601
2015-05-21 15:34:28 -07:00
e4f86a8934
Adding pass/fail retry logic to connection attempts #4697 #4650
2015-05-21 15:22:39 -07:00
8b49eb6595
Removed unused function #4601
2015-05-21 15:19:00 -07:00
c22e327eed
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-21 11:37:42 -07:00
0de7a08b4c
Updated wizard version to '4' to force plugin download #4529
2015-05-21 16:49:07 +01:00
18d85f1b6b
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-20 16:56:32 -07:00
68ecdc0753
Added additional logging to help debug potential problems related to performance and SSL WAIT states #4650
2015-05-20 16:54:42 -07:00
7dbe30cb61
Fixed Linux uses wrong clipboard event #4601
2015-05-20 14:43:58 -07:00
ad86041433
Added code to test for and error out of max retry condition #4650
2015-05-20 14:27:25 -07:00
1af9d58a9b
Changed conditional to match coding standard #4650
2015-05-20 14:14:30 -07:00
81a70135bd
Added concept of a max retry count to SecureSocket class #4650
2015-05-20 13:50:18 -07:00
994a9433fe
Converting retry to a counter #4650
2015-05-20 12:08:25 -07:00
3e9fc89d96
Modified server to use correct clipboard format #4601
2015-05-20 19:54:56 +01:00
490667e21b
Used StreamChunker to send clipboard in chunks #4601
2015-05-20 19:54:17 +01:00
cf5347c8f6
Sent clipboard on a thread #4601
2015-05-20 19:53:30 +01:00
49ac320f97
Refactored clipboard event into ClipboardEvent #4601
2015-05-20 19:09:54 +01:00
950219b39e
Fixed init order warning on Mac #4624
2015-05-20 17:51:52 +01:00
561204b2a7
Disabled threading on most IPC logging tests #4624
...
Threading was making it very hard to reliably run the IPC logging tests
(many timing issues), so I disabled threading for most of the tests.
2015-05-20 17:42:07 +01:00
89a977da66
Positive tests for IPC logging #4624
...
So far I had only tested what happens when the limits are exceeded.
These new tests are for when usage is within limits.
2015-05-20 16:16:22 +01:00
a710b2752b
Reintroduced sleep for really fast computers #4624
2015-05-20 16:07:09 +01:00
9636af61d6
Solution attempt for timing bugs in write_bufferRateLimit
...
It's probably better to wait until the buffer is sent, rather than
waiting until its empty. To test the output it has to be sent, but
because of timing, it may be emptied at any point.
2015-05-20 15:51:07 +01:00
f1af62927e
Stopped Unix plugin loader from throwing #4661
...
Tested on Mac OS X only
2015-05-20 15:24:10 +01:00
a6dfbbe021
Validated received clipboard data size #4601
2015-05-19 14:28:38 -07:00
2c74a7f5c1
Added stringToSizeType and its unittest #4601
2015-05-19 14:23:43 -07:00
c032091dd5
Added send clipboard finish log #4601
2015-05-19 13:51:13 -07:00
00ceda55dc
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-19 11:37:45 -07:00
eaff6f50f8
Added sending clipboard chunks handling #4601
2015-05-19 10:54:02 -07:00
6e7b3d87c5
Added changes for StreamChunker that is left from last commit #4601
2015-05-19 09:37:15 -07:00
c674642181
Used StreamChunker for clipboard and file transfer #4601
...
Clipboard is not handled at this point
2015-05-19 09:30:35 -07:00
11a7d2c4c2
Stopped Windows plugin loader from throwing #4661
...
System error message hidden with 'SetErrorMode(SEM_FAILCRITICALERRORS)'
2015-05-19 14:40:33 +01:00
46527ded56
Limited Windows service log file size to 1MB #4677
...
Oversized file is renamed to .1 to keep old log files in case needed,
but the old file will eventually be overwritten on 2nd recycle
2015-05-19 14:04:02 +01:00
2cce60f672
Fixed sleep timing on IPC log rate limit unit tests #4624
...
Still a little hacky, but seems stable on my dev machine
2015-05-19 10:41:04 +01:00
efa358f917
Added comment about hacky log line #4690
...
@XinyuHou, when adding hacks, please annotate with a comment
2015-05-19 10:28:02 +01:00
70be9cd97f
Refactored intToString #4601
2015-05-18 11:27:54 -07:00
af73e8280d
Increased protocol version number to 1.6 #4601
2015-05-18 11:25:58 -07:00
62a501066f
Disabled IPC logging tests for Mac and Linux #4624
...
This is a bit hacky, but IPC logging isn't used on Mac and Linux anyway,
and we're hopefully going to remove it.
2015-05-18 18:19:43 +01:00
30f96b9fbb
Renamed FileChunker to StreamChunker #4601
2015-05-18 10:17:22 -07:00
9f577ca4f3
Added rate limiting to IPC logging #4624
2015-05-18 18:06:58 +01:00
b27b236c07
Disabled failing IPC tests for Mac #4651
2015-05-18 16:39:54 +01:00
984c5885f7
Fixed Mac build by hacking out mutex close #4651
2015-05-18 16:09:09 +01:00
4c36c08099
Send clipboard data in a thread #4601
2015-05-16 00:06:38 +01:00
44089d55e8
Send clipboard data in small chunks without using thread #4601
2015-05-15 22:28:43 +01:00
e60b3a6feb
Added truncating to IPC log buffer queue #4651
...
When the IPC log buffer is too large, the oldest log line is removed
when a new log line is added.
2015-05-15 15:04:16 +01:00
aac59fbf7e
File missing from last commit #4651
2015-05-15 14:44:25 +01:00
2e3769c7a6
Added failing test for IpcLogOutputter::write(...) #4651
...
- Changed behavior of close() to stop the buffer thread
- Fixed code style in IpcLogOutputter.cpp
- Changed MAX_SEND macro to enum
- Added Doxygen @name sections
2015-05-15 14:43:42 +01:00
08aee6cba7
Fixed cast error from pointer to small type on Unix #4601
2015-05-14 14:39:03 -07:00
220b6befab
Used a thread to send clipboard data #4601
2015-05-14 13:51:21 -07:00
134a15ea8d
Modified IpcServer to be mockable #4651
...
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
8c82996fc4
Merge pull request #4608 from legonigel/master
...
Rename license to LICENSE closes #4487
2015-05-08 09:06:06 -07:00
9b87ca3807
Fix missing DLLs after install #3774
...
The CompanionFile attribute was causing the installer to be confused:
Won't Overwrite; Won't patch; Existing file is unversioned but modified
and hence not install a bunch of these DLLs in some cases.
2015-05-08 00:54:09 +01:00
1c5ade982e
Merge branch 'build_using_openssl_binaries'
2015-05-07 10:26:59 +01:00
d71304ee55
Modified header of every file COPYING to LICENSE
...
Modified to match the updated name of the license file
2015-05-06 22:12:44 -04:00
be1769e4a5
Fixed Mac crashes instantly on syntool segfault #4581
2015-05-06 16:36:49 +01:00
932b0f0c55
Fixed GUI doesn't start after install on Windows #4607
2015-05-06 16:19:51 +01:00
50c8f87a6a
Updated translation files
2015-05-06 15:28:19 +01:00
9e9e1362ac
Fixed typo and regenerated master ts #4596
2015-05-06 14:25:18 +01:00
02bfeff1b2
Merge pull request #4596 from joweiser/patch-1
...
Typo 'occurred' in WebClient.cpp
2015-05-06 14:00:07 +01:00
68edff43cd
Merge branch 'pr-jpmcmu-macosx-sticky-key-fix'
2015-05-06 13:20:54 +01:00
1f0adb0d7b
Fixed warning on Linux #4570
2015-05-06 12:11:12 +01:00
c168721d2f
Added deprecated args handling #4570
2015-05-06 11:57:42 +01:00
c3f003bf5b
Adding new binary installer locations to make files #4587
2015-05-01 16:56:45 -07:00
a88bf3d3f0
Merge branch 'master' of https://github.com/synergy/synergy into build_using_openssl_binaries
2015-04-30 09:31:55 -07:00
82bb539d5e
Typo in WebClient.cpp
2015-04-29 22:18:15 +02:00
5266d94faa
Added code to fetch openssl libs from archetecture specific location #4587
2015-04-29 11:35:12 -07:00
503a6e26bf
Added variable to define location of windows binaries #4587
2015-04-29 10:27:41 -07:00
4af987e8de
Made secure socket logging more user friendly #4558
2015-04-29 13:25:01 +01:00
e8b4017960
Changing ns plugin to use new binaries instead of older source directory. #4587
2015-04-28 11:55:59 -07:00
a597596654
Merge branch 'MacOSX-Sticky-Key-Fix' of https://github.com/jpmcmu/synergy into pr-jpmcmu-macosx-sticky-key-fix
2015-04-24 12:34:08 +01:00
c7b444a762
Modified auto hide feature #4569
...
Made auto hide on startup and added an info masseage on first connection
2015-04-23 17:32:18 +01:00
fb76dee8cc
Reintroduced GUI auto-hide setting (disabled by default) #4569
2015-04-23 15:37:07 +01:00
fb6186304b
Dropped SSLv3 support #4567
2015-04-23 13:02:42 +01:00
decf7ca313
Removed unused dependency #4520
2015-04-23 13:02:42 +01:00
a7848d6cd2
Made comment more clear #4567
2015-04-23 13:02:42 +01:00
8cd256a0b2
Removed stray character.
2015-04-23 07:04:29 -04:00
9978a85a4f
Added modifier flags to mouse events as a fix for sticky keys.
2015-04-22 19:33:25 -04:00
363dc78ca8
Updated local fingerprint after wizard is finished #4557
2015-04-21 17:56:01 +01:00
018480412a
Stopped retry when fatal error happened in secure socket #4553
2015-04-21 16:54:49 +01:00
423d698436
Fixed secure socket using old trusted fingerprint path #4525
2015-04-21 16:46:05 +01:00
f56d06d95d
Disabled auto-hide feature #4390
2015-04-21 16:25:55 +01:00
d184be31b5
Fixed: SSL dir not created on Mac #4551
2015-04-21 14:48:28 +01:00
dbc5da7a48
Refactored certificate class (part 2) #4549
2015-04-21 12:55:45 +01:00
7e239c6f71
Refactored certificate class
...
Split `generateCertificate` into separtate `generateFingerprint`
function, renamed a few functions, removed some unused functions.
2015-04-20 19:26:41 +01:00
a894615ca7
Fixed ns plugin using old certificate path #4525
2015-04-20 19:08:03 +01:00
f997aea8e7
Moved SSL generate code as is into new class #4549
2015-04-20 18:51:22 +01:00
2a2d095527
Merge branch 'master' of https://github.com/synergy/synergy
2015-04-20 16:53:34 +01:00
aa9504f43e
Changed filenames in app data directory #4525
...
- Changed `ssl` to `SSL`
- Moved pem file to `SSL`
2015-04-20 16:40:50 +01:00
97060d9698
Removed unused SSL download code #4546
2015-04-20 16:31:36 +01:00
a649a0e3df
Reduced code duplication in fingerprint logic #4548
2015-04-20 16:28:26 +01:00
5e2b8a5048
Fixed #4537 by add file error checking
2015-04-20 16:16:53 +01:00
80fd3cc01b
Refactored fingerprint file path logic #4525
2015-04-20 15:58:11 +01:00
36a6bb9218
Removed OpenSSL download from plugin manager #4546
2015-04-20 15:27:24 +01:00
cf6a6bcd48
Removed dead code #4527
2015-04-20 14:57:59 +01:00
e6e3eae0a9
Disabled reconnect after fingerprint failed #4527
2015-04-20 14:43:39 +01:00
453638fa39
Added OpenSSL component to installer #4546
2015-04-20 14:35:52 +01:00
365d16c94b
Added more status details #4537
2015-04-17 16:33:43 +01:00
586a893201
Made retry secure write/read use the exactly last parameters #4539
2015-04-17 14:01:35 +01:00
951cbe9a62
Enable network security checkbox only when ns plugin exists #4540
2015-04-16 17:15:58 +01:00
59d013ac6a
Show fingerprint only when file exists #4526
2015-04-16 17:12:42 +01:00
88538e5ee6
Resolve #4526 added local fingerprint in server GUI
2015-04-16 15:10:33 +01:00
7ab1081b3f
Fixed server crash caused by double delete a socket #4535
2015-04-16 11:55:05 +01:00
7c6561b3da
Fixed #4528 - invalid/misleading log line
2015-04-15 15:17:30 +01:00
14bf90264e
Renamed function, was reserved keyword on Mac #4522
2015-04-15 14:49:05 +01:00
c7de2da062
Comment out unused fingerprint filename consts #4522
...
Causing compile to fail on Mac (fails on warnings)
2015-04-15 14:33:26 +01:00
407f92e9d4
Removed --certificate-fingerprint argument #4522
...
Used profile dir for fingerprint file path instead
2015-04-15 14:16:28 +01:00
6580ad0015
Merge branch 'master' of https://github.com/synergy/synergy
2015-04-15 13:40:55 +01:00
2752d24dc4
Merge branch 'jerry-sandbox'
2015-04-15 13:33:39 +01:00
e405ec25e3
Always log out server fingerprint #4522
2015-04-15 13:25:18 +01:00
689737ee7a
Fingerprint file check and trust logic #4522
...
Also refactored the 'get profile dir' code to use the core interface
(reduce code duplication)
2015-04-15 13:09:22 +01:00
52d9b1beed
Logged out new fingerprint when not match #4522
2015-04-15 13:06:49 +01:00
1e2b822226
Removed unused variable
2015-04-14 17:52:24 +01:00
fa1ea0022b
Fixed code style
2015-04-14 17:52:15 +01:00
f60e98c8cd
Fixed error from merge
2015-04-14 17:52:08 +01:00
916a4c75af
Refactored no or wrong ssl certificate error handling #4410
...
Conflicts:
src/lib/net/TCPListenSocket.cpp
src/lib/plugin/ns/SecureListenSocket.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
2015-04-14 17:52:00 +01:00
dd574c4f2c
Added unit tests for string operations
2015-04-14 17:51:50 +01:00
28eb85660f
Fixed error from merge
2015-04-14 17:51:41 +01:00
b4665b9cd5
Passed args into client and socket
...
Conflicts:
src/lib/client/Client.cpp
src/lib/client/Client.h
src/lib/synergy/ClientApp.cpp
src/test/integtests/net/NetworkTests.cpp
2015-04-14 17:51:31 +01:00
39e183da3e
Refactored string operations
...
Conflicts:
src/lib/base/String.cpp
2015-04-14 17:51:19 +01:00
cb0f0dd06d
Improved fingerprint verification #4522
...
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
src/lib/synergy/ClientApp.cpp
2015-04-14 17:50:49 +01:00
b24eb2b724
Removed test string #4522
2015-04-14 17:50:36 +01:00
71dc472a64
Fixed code style
2015-04-14 17:49:56 +01:00
b8ba37b4f4
Made callback function global #4522
2015-04-14 17:49:33 +01:00
5dfe4aa0b5
Added verification of server certificate fingerprint #4522
...
Conflicts:
src/lib/mt/Thread.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/synergy/ClientArgs.cpp
2015-04-14 17:46:58 +01:00
07b1ea203f
Message box asking user to verify fingerprint #4522
2015-04-14 17:29:08 +01:00
6e2ccb8f8d
Merge pull request #4422 from legonigel/shortcut_fix
...
Changed server shortcut on GUI main window
Fixes #4367
2015-03-28 08:56:36 +00:00
1bbd086a17
MacOSX Double / Triple Click Fix
...
This patch corrects issues with double click and adds triple click to
MacOSX. Double click was functioning but double clicking and then
dragging would not work.
2015-03-21 13:41:00 +00:00
ecd51d231b
Revert "Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"""
...
This reverts commit 7f721ee7b1
2015-03-21 13:38:20 +00:00
7f721ee7b1
Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix""
...
This reverts commit 32323bc0d1
2015-03-21 11:42:37 +00:00
32323bc0d1
Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"
...
This reverts commit b5effc0591297100c88a
2015-03-21 11:36:38 +00:00
b5effc0591
Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix
2015-03-21 11:08:53 +00:00
447169df32
Fix #4349
...
Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych.
2015-03-20 03:12:50 -04:00
393ac100c8
Changed shortcut on main window gui for server
...
The shortcut for the server checkbox on the main gui is now Alt-V. This deconflicts the start/stop button.
Fixes #4367
2015-03-09 11:47:13 -04:00
702d79570d
Merge pull request #4414 from JoshMcCullough/4389
...
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-09 10:55:43 +00:00
4ac8f61a54
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-06 18:10:39 -05:00
2feb916f2f
Unfucked --enable-drag-drop arg parse #4168
2015-03-04 15:10:03 +00:00
3364d38498
Removed unused retry variables #4313
2015-03-04 14:07:43 +00:00
b4a1c3627f
Improved SSL error handling for accept/connect socket #4313
2015-03-04 13:59:53 +00:00
501dc6c886
More user-friendly SSL errors, and rate limited failure #4313
2015-03-04 13:42:19 +00:00
9cdff4a910
Removed throw from checkResult (causes client to freeze) #4313
2015-03-04 12:26:54 +00:00
87a81adeb4
Improved SLL error messages and throw on cert error #4313
2015-03-04 12:15:56 +00:00
55de0746dc
Copy all plugin files to bin dir (including symbols) #4168
2015-03-04 12:03:38 +00:00
a2524d9f57
Make profile dir hack Windows only #4168
2015-03-04 11:51:56 +00:00
719e8f6b56
Revert "More robust secure socket error handling #4313 "
...
This reverts commit 40fa58de8c
2015-03-04 11:43:52 +00:00
1c2576b8d7
Revert "Rephrased "crypto disabled" log, changed to error #4313 "
...
This reverts commit a6b5c872f5
2015-03-04 11:43:45 +00:00
6ef41522b7
Revert "Fixed: Exception was not thrown on secure accept/connect #4313 "
...
This reverts commit c5ed03a8a0
2015-03-04 11:43:42 +00:00
cfd21216cd
Fixed: Plugins dir may change depending on user #4168
2015-03-04 11:15:07 +00:00
c5ed03a8a0
Fixed: Exception was not thrown on secure accept/connect #4313
2015-03-04 10:14:21 +00:00
a6b5c872f5
Rephrased "crypto disabled" log, changed to error #4313
2015-03-04 09:00:01 +00:00
065960926c
Made OpenSSL config file location Windows-only #4313
2015-03-03 19:51:41 +00:00
40fa58de8c
More robust secure socket error handling #4313
2015-03-03 19:21:14 +00:00
b6a3788fea
Removed remnants of synmacph tool (part 3) #4398
2015-03-03 18:06:02 +00:00
7add4f4d3f
Fixed: Compile errors on Linux #4168
2015-03-03 17:29:52 +00:00
b8a5abc19f
Download and extract OpenSSL dependencies #4313
2015-03-03 11:42:26 +00:00
c181d5f480
Fixed #4358 - Corrected typo
2015-03-03 09:23:06 +00:00
68a49e0a3a
Fixed: Code style for "OpenSSL" should be "OpenSsl" #4313
2015-03-03 08:38:27 +00:00
f8847bfde8
Changed OpenSSL to SSL in GUI settings #4313
2015-03-03 08:36:01 +00:00
bce1d5be64
Fixed: Plugin manager doesn't download openssl.exe #4313
...
Refactored use of DataDownloader in PluginManager
2015-03-03 08:27:39 +00:00
450435d062
Removed remnants of synmacph tool (part 2) #4398
2015-03-02 18:06:23 +00:00
5767790e1e
Removed remnants of synmacph tool #4398
2015-03-02 17:50:42 +00:00
6e7b9491d4
Fixed: Incorrect log level used #4168
2015-02-26 16:44:15 +00:00
9314e64ce3
Drag/drop enabling is configurable in the GUI.
2015-02-26 02:01:00 -05:00
dd57a93345
Added OpenSSL DLLs to Windows installer #4313
...
libeay32.dll
ssleay32.dll
2015-02-26 00:04:17 +00:00
bcf1a1c4d4
Added extra logging to plugin loaders #4168
2015-02-26 00:03:24 +00:00
64c350fd96
Fixed: Plugin manager doesn't detect wow64 #4168
2015-02-25 21:22:43 +00:00
e4199b976e
Improved wording for enable OpenSSL setting #4313
2015-02-25 18:15:38 +00:00
eb1083ec45
Fixed: Missing 'else if' on arg parsing #4168
2015-02-25 17:44:17 +00:00
a1bfddeb5b
Changed plugin manager to use installed arch #4168
...
Using the processor arch to figure out which plugin to downloa is not
the best idea, since a user could install 32-bit Synergy on 64-bit
Windows.
2015-02-25 17:43:48 +00:00
40d304dc24
Refactored "syntool" usage into CoreInterface #4168
2015-02-25 17:19:33 +00:00
595e403c87
Fixed: Spinner doesn't stop when no plugins #4168
...
Also refactored duplicate code
2015-02-25 08:35:07 +00:00
c300b65662
Fixed: Plugin downloader freezes if no plugins #4168
2015-02-25 08:17:16 +00:00
a30a685ed2
Improved wording on plugin downloader #4168
...
Also used translate function on strings
2015-02-25 08:16:24 +00:00
3a0068ec2e
Fixed: Plugin downloader fails if no plugins #4168
2015-02-24 21:19:52 +00:00
5e580e5266
Improved use of English on activate screen #4168
2015-02-20 19:58:37 -05:00
bca57674d0
Added patch that will better detect which Linux distribution is used when determining which plugins to URL to generate.
2015-02-14 19:25:22 -08:00
b9e178a9ee
Fixed compiler warning on non-windows systems.
2015-02-14 19:22:08 -08:00
226f2c966a
assigned arch static instance instead of create a new one #4313
2015-02-13 15:58:54 +00:00
4014176d8e
Revert "created new instance of arch in plugin #4313 "
...
This reverts commit 8e4f758cb1
2015-02-13 14:26:03 +00:00
9f1255d986
Revert "did not pass arch into plugins #4313 "
...
This reverts commit 0f686ff308
2015-02-13 14:25:29 +00:00
0f686ff308
did not pass arch into plugins #4313
2015-02-13 12:42:23 +00:00
8e4f758cb1
created new instance of arch in plugin #4313
2015-02-13 12:35:12 +00:00
d642714fe8
add padlock icon when use secure connection #4313
2015-02-13 10:14:11 +00:00
629f4b1781
used live url for openssl binary #4168
2015-02-12 17:40:38 +00:00
4cd20d97ea
changed profile directory on mac #4168
2015-02-12 16:52:34 +00:00
81bb74a24b
greyed out network security group when no plugin available #4168
2015-02-12 16:49:18 +00:00
6cf40afcd7
added copyright #4168
2015-02-12 16:20:03 +00:00
14bd991b24
productized setting dialog #4168
2015-02-12 16:18:44 +00:00
c4c0fc8a08
added enable crypto argument to synergys/c #4313
2015-02-12 15:50:08 +00:00
bbcca144f5
hacked avoid syntool sigsegv on linux #4168
2015-02-11 17:32:18 +00:00
b9c5eb2e6f
added certificate generate #4168
2015-02-11 17:28:56 +00:00
80343c41eb
deleted old home brew crypto #4313
2015-02-11 11:12:54 +00:00
4fcec1d217
limited ns pluging to Mac 10.8 and above #4168
2015-02-10 16:20:49 +00:00
7d5df54bd0
fixed copy command for libns on Linux #4168
2015-02-10 13:07:52 +00:00
31440b1a8a
added const cast #4168
2015-02-10 12:22:30 +00:00
98716f4e78
fixed compile error on ubuntu64 #4168
2015-02-10 12:13:59 +00:00
3c4b6163e3
Merge remote-tracking branch 'origin/jerry-sandbox'
2015-02-10 10:28:45 +00:00
b178d33d62
added plugin downloading from servere #4168
2015-02-09 15:37:47 +00:00
05e6cb6254
queried plugin list from server #4168
2015-02-06 10:39:58 +00:00
82b932b1c4
added download plugin page in wizard #4168
2015-02-05 15:52:50 +00:00
aa46fe91a7
added activate page in wizard #4168
2015-02-05 14:17:34 +00:00
097f4c4c1f
Revert "added login window #4168 "
...
This reverts commit ccc5834757
2015-02-05 11:44:33 +00:00
c25b6a8bf6
Revert "stored user email, token and type in settings #4168 "
...
This reverts commit 319de60286
2015-02-05 11:44:31 +00:00
f4f7315a54
Revert "added copy right #4168 "
...
This reverts commit e2fb03b8ce
2015-02-05 11:44:28 +00:00
fc04901cda
Revert "moved gui into main subfolder #4168 "
...
This reverts commit 39f98d8133
2015-02-05 11:44:23 +00:00
db1a611171
Revert "added plugin manager gui #4168 "
...
This reverts commit bfa9bab78d
2015-02-05 11:44:14 +00:00
c34928b7c8
Revert "seperated login result and edition type #4168 "
...
This reverts commit da68664bda
2015-02-05 11:44:10 +00:00
c81fa7db52
Revert "changed login window to dialog #4168 "
...
This reverts commit d1c1d79453
2015-02-05 11:44:04 +00:00
52005f0905
Revert "changed plugin manager gui from window to dialog #4168 "
...
This reverts commit 1132da4598
2015-02-05 11:43:54 +00:00
a0090c69ba
wq
...
Revert "fixed plugin gui compile error on mac #4168 "
This reverts commit f6d4cf1c38
2015-02-05 11:42:08 +00:00
f6d4cf1c38
fixed plugin gui compile error on mac #4168
2015-02-04 19:11:54 +00:00
1132da4598
changed plugin manager gui from window to dialog #4168
2015-02-04 18:17:06 +00:00
d1c1d79453
changed login window to dialog #4168
2015-02-04 17:30:06 +00:00
da68664bda
seperated login result and edition type #4168
2015-02-04 15:07:52 +00:00
bfa9bab78d
added plugin manager gui #4168
2015-02-04 14:09:03 +00:00
39f98d8133
moved gui into main subfolder #4168
2015-02-04 14:04:30 +00:00
5f33a21878
deleted secure socket when close client time out #4313
2015-02-02 16:06:51 +00:00
3aa6bed669
handled SSL connect failed on client side #4313
2015-02-02 15:33:40 +00:00
10e6b5ad63
removed client connection when SSL handshake failed #4313
2015-02-02 14:18:34 +00:00
e2fb03b8ce
added copy right #4168
2015-02-02 10:52:40 +00:00
319de60286
stored user email, token and type in settings #4168
2015-01-30 17:38:12 +00:00
ccc5834757
added login window #4168
2015-01-30 16:04:27 +00:00
ad230d46e6
handled secure socket exception #4313
2015-01-29 16:16:45 +00:00
767802f111
removed loop accept and connect and added more debug info #4313
2015-01-29 15:40:30 +00:00
d15c99f41d
rearranged the deletion orders of clientlistener and server #4313
2015-01-28 17:34:19 +00:00
4e42b9fdbd
fixed memory leak and validate ssl #4313
2015-01-28 17:33:10 +00:00
622e40e5d7
managed secure socket allocation and deallocation #4313
2015-01-28 13:07:03 +00:00
d80aa7c938
resolve #4337 removed IStreamFilterFactory dead code
2015-01-27 11:33:06 +00:00
a53dae9be3
added assersions before lib func invoking and adjust log level #4313
2015-01-27 11:04:23 +00:00
85813fd49b
added plugin unload and cleanup #4313
2015-01-27 10:42:10 +00:00
10cddb97a8
fixed misused read and write #4313
2015-01-26 13:23:11 +00:00
06253c965b
resolve #4328 by moving plugin into lib folder
2015-01-20 16:18:51 +00:00
a98c4bd02a
made init function signature consistent #4313
2015-01-20 16:00:15 +00:00
141b778477
refactored SecureSocket to use interface #4313
2015-01-14 17:25:53 +00:00
be2b87fd39
fixed code style
2015-01-12 10:51:16 +00:00
f973d1498d
dropped prefix C
2015-01-12 10:33:29 +00:00
7bff958422
added pluging loader for unix #4313
2015-01-09 13:47:35 +00:00
1d7eb3f5cb
updated pluging loader for Windows #4313
2015-01-09 13:46:35 +00:00
de8fe7e2a5
fixed compiler cast warning in drag info class
2015-01-06 14:51:37 +00:00
95a1752396
ported secure socket class from enterprise to ns plugin #4313
2015-01-06 14:20:05 +00:00
a0f2261931
added new ns plugin #4313
2015-01-06 13:52:11 +00:00
1f41b92693
Fixed client detected dialog not shown when Synergy is minimized #4307
2015-01-05 13:32:58 +00:00
5703a41489
Update Server.cpp
...
clarified "cursor is locked" messages, moved the "scroll lock is on upon startup" message to NOTE level instead of DEBUG.
2014-12-30 13:33:21 -08:00
d62c4a842b
Update App.h
...
update --help output.
2014-12-16 18:04:00 -08:00
a99bea9d3b
clarify protocol error message
2014-12-05 16:59:39 -08:00
56b54da915
MacOSX Double / Triple Click Fix
...
This patch corrects issues with double click and adds triple click to
MacOSX. Double click was functioning but double clicking and then
dragging would not work.
2014-12-04 15:15:38 -05:00
ebba77fd33
Suppressed empty server warning on startup #4240
2014-12-02 15:03:19 +00:00
db9f7974ed
Fixed #4249 by add retain count for extension string
2014-12-02 12:36:01 +00:00
774b217e8f
Fixed typo #4247
2014-12-01 18:32:00 +00:00
0d3f14adb9
Fixed name conflict #4247
2014-12-01 18:19:20 +00:00
b60608ece9
Fixed #4247 - Added firewall exception
2014-12-01 17:46:42 +00:00
917c75026f
Show add client dialog only if main window is active #4230
2014-12-01 11:22:42 +00:00
48b552a0e8
Made auto config checked after Bonjour download #4235
2014-11-28 16:34:16 +00:00
e6e4f1b53d
Deleted the download thread in a Qt way #4235
2014-11-28 15:23:08 +00:00
17278f7224
Closed wizard then open mainwindow #4235
2014-11-28 15:01:23 +00:00
4452f14114
Updated zeroconf after Bonjour is installed #4235
2014-11-28 12:57:57 +00:00
00d6b23d57
Use auto config if Bonjour already installed #4240
2014-11-28 11:21:45 +00:00
581d4c5469
Added a icon for download message box #4235
2014-11-28 10:54:51 +00:00
216f0f160d
Resolved #4242 keep auto config name consistent
2014-11-28 10:51:52 +00:00
1730258311
Fixed wrong download message box title #4235
2014-11-27 19:11:01 +00:00
d448fb777b
Merged 2 msgboxes into 1 when first startup #4240
2014-11-27 19:08:30 +00:00
a0cc3d6e7f
Made Bonjour install in another thread #4235
2014-11-27 18:31:45 +00:00
af4817d075
Suppressed auto connect warning on startup #4240
2014-11-27 18:31:42 +00:00
54e294bffb
Improved auto connect massage #4237
2014-11-27 10:52:25 +00:00
79f534273f
Ran Bonjour installer in passive mode
2014-11-27 10:52:21 +00:00
dff2cb34be
Download Bonjour installer according to system architecture
2014-11-27 10:52:19 +00:00
d89cb46912
Showed auto connect prompt after main window
2014-11-27 10:52:17 +00:00
2e744b0f02
Auto start Synergy after a new client added
2014-11-27 10:52:16 +00:00
3b1e15ba08
Try user specified name when auto detect failed
2014-11-27 10:52:14 +00:00
97ea94de69
Solved zeroconf service name conflict
2014-11-27 10:52:12 +00:00
5222b81600
Changed message box when no server detected
2014-11-27 10:52:10 +00:00
c560eabeb2
Fixed close null mutex and condvar
2014-11-27 10:52:08 +00:00
f022d814e6
Removed duplicated arch instance
2014-11-27 10:52:07 +00:00
7c02369437
Stopped starting synergy when server is detected
2014-11-27 10:52:05 +00:00
5afd94edb3
Added mutex for updating zeroconf service
2014-11-27 10:52:03 +00:00
c323003f65
Removed dead code
2014-11-27 10:52:01 +00:00
40ef0b03c2
Made Mac buttons the same layout as Windows ones
2014-11-27 10:51:59 +00:00
e71e7e1cd3
Catched exception while getting active desktop name
2014-11-27 10:51:58 +00:00
5833b434ef
Changed message box types
2014-11-27 10:51:56 +00:00
a289c1cbe3
Showed first tab in server config dialog as default
2014-11-27 10:51:54 +00:00
20db8d55af
Modified and centered install Bonjour msgbox
2014-11-27 10:51:52 +00:00
ec4ef549bb
Added ignore auto connect clients check box in dialog
2014-11-27 10:51:50 +00:00
471e198efc
Fixed race condition for updating zeroconf service
2014-11-27 10:51:49 +00:00
56b3231a6c
Made service error log more readable
2014-11-27 10:51:47 +00:00
22475067de
Fixed the warning logic when hostname is empty
2014-11-27 10:51:45 +00:00
1a69f458b7
Shown client name in detect dialog
2014-11-27 10:51:42 +00:00
2aec1223ae
Show server list when 2 or more servers detected
2014-11-27 10:51:39 +00:00
66a1ffa5f5
Added ignore auto connect clients check box
2014-11-27 10:51:36 +00:00
aa9990fba9
Updated server config dialog UI generated by Qt
2014-11-27 10:51:33 +00:00
b2435cdaef
Resolve #4230 more user friendly dialog when client is detected
2014-11-27 10:51:29 +00:00
30f478ad5c
Fixed legacy resource filename
2014-11-27 10:51:25 +00:00
fa1092d665
Resolve zeroconf uses bogus IPs #4091
2014-11-27 10:51:22 +00:00
8d7f6e146d
Fixed startSynergy twice when detect the first server
2014-11-27 10:51:18 +00:00
f0cb271902
Resolved Auto-conf server select #4218
2014-11-27 10:51:15 +00:00
6cb589d18e
Made Bonjour install Windows only #4196
2014-11-27 10:51:12 +00:00
6fd8afafbd
Solved #4196 by download and open Bonjour installer
2014-11-27 10:51:08 +00:00
376c983d21
Added cancel download
2014-11-27 10:51:05 +00:00
8503833e3d
Added seamless download of Bonjour
2014-11-27 10:51:01 +00:00
f781cce156
Prompt to enable auto connect #4196
2014-11-27 10:50:58 +00:00
5bd65b5426
Added download Bonjour code
2014-11-27 10:50:54 +00:00
330121ce55
Asked users if they want to install Bonjour
2014-11-27 10:50:51 +00:00
5db30cff74
Fixed memory leak
2014-11-27 10:50:47 +00:00
588494a730
Check is Bonjour running before update zeroconf
2014-11-27 10:50:44 +00:00
6ef744cd81
Added code to check if Bonjour service is running
2014-11-27 10:50:40 +00:00
c51ce29954
Removed Bonjour dependency in wix
2014-11-27 10:50:37 +00:00
06df954366
fix removing jobs for closed sockets from m_socketJobs (patch by Brian Vincent from synergy issue tracker #2866 )
2014-11-14 18:29:28 +04:00
9fd11da578
Drop C prefix on Windows
2014-11-12 11:44:29 +00:00
e5e0a3b653
Drop C prefix on Linux
2014-11-12 11:28:41 +00:00
67377109f3
Moved Screen class into synergy namespace
2014-11-11 17:45:24 +00:00
a4843c4947
Fixed "c" prefix compile error on Mac 10.10
2014-11-11 14:58:30 +00:00
1aaa55163c
Fixed "c" prefix compile error on Windows
2014-11-11 14:50:09 +00:00
41d6080028
changed company name in copyright notice
2014-11-11 13:52:03 +00:00
e8e156f0e2
dropped "c" prefix from class names
2014-11-11 13:51:47 +00:00
afa24f4a02
Disable the privilege helper tool #4191
2014-11-06 17:08:58 +00:00
37be6ec45f
Merge pull request #4160 from cribe78/cribe-pullrequest#4055
...
Fixed: Shift keys are not sent to clients #4055
2014-11-06 15:39:30 +00:00
d347cbd45f
Merge branch 'pdecat-master'
2014-11-05 10:25:31 +00:00
65fc59eeae
clean up changes for pull request
2014-11-04 12:17:30 -05:00
93d864ad6f
clean up changes for pull request
2014-11-04 12:16:58 -05:00
8024aa9ab1
Working fix for #4055 (client shift key problem) in place
2014-11-04 12:06:30 -05:00
117208754f
Hided elevate checkbox on Unix #4130
2014-10-27 17:15:50 +00:00
23670c5f9b
Moved elevate checkbox to settings #4130
2014-10-27 17:10:12 +00:00
d2191b6b93
Auto elevate for Windows UAC and screen lock #4130
2014-10-27 16:39:18 +00:00
4d3fd14ada
Merge branch 'caramis-master'
2014-10-27 14:46:54 +00:00
6756296d85
Made daemon take full responsibility for logging #4128
2014-10-27 14:11:43 +00:00
39b534f3b8
Merge branch 'petroules-mac-fixes'
2014-10-27 13:04:59 +00:00
de68346874
Fixed hm config error
2014-10-27 11:58:25 +00:00
df29bf8e54
Merge branch 'helkanen-master'
2014-10-24 15:10:44 +01:00
5b4e46f8ea
Fix Info.plist for Synergy GUI.
...
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07:00
5c6eba8790
Merged argsParse to master
2014-10-23 13:21:41 +01:00
a32cb41342
Parse arg refactoring #4124
...
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
a71ebc78b3
Parse arg refactoring #4124
...
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
943a355359
Parse arg refactoring #4124
...
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
e26ccfdce6
Parse arg refactoring #4124
...
Added unit testing
2014-10-22 16:52:08 +01:00
f9f2d8e8af
Parse arg refactoring #4124
...
Implemented argParser class.
2014-10-22 16:35:28 +01:00
d2814a423c
Parse arg refactoring #4124
...
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
bc772f98a6
Unable to start synergy server with "Cannot create a file when that file already exists" message #3752
...
Go to next iteration as soon as it fails.
2014-10-22 12:53:14 +01:00
c2b3f1414b
Merge branch 'master' of https://github.com/pdecat/synergy into pdecat-master
2014-10-22 12:49:16 +01:00
9e358233c3
Fix copy&paste for EFL applications
...
Fixes issue 4021.
2014-10-22 20:32:16 +09:00
4a24a2117a
Merge branch 'master' of https://github.com/caramis/synergy into caramis-master
2014-10-22 11:59:14 +01:00
4aa43d6995
Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit
2014-10-22 11:40:00 +01:00
a58ca97941
Merge remote-tracking branch 'origin/master'
2014-10-21 16:00:56 +01:00
504e41966e
Carbon loop not ready within 5 sec #4002
...
Port fix from enterprise.
2014-10-21 15:48:04 +01:00
3a663092cf
Do not throw exception if ProcessIdToSessionId() is failed.
...
Many security solutions forbid other program from accessing their own process. So if ProcessIdToSessionId() is failed, simply ignore it.
Signed-off-by: SeokYeon Hwang <caramis@gmail.com>
2014-10-21 19:51:28 +09:00
7dd2db25ec
Add support for building with 64-bit architectures on OS X.
...
This patch brings full 64-bit compatibility to Synergy on OS X by
replacing all obsolete 32-bit only Carbon functions with modern
equivalents. All functions introduced have been available since 10.4 so
this won't affect the minimum deployment target. Specifically:
Creating an empty CGEvent and getting its location is behaviourally
identical to GetGlobalMouse, and yes, both are in flipped coordinates.
This was tested with a multi-monitor configuration as well.
TrackMouseLocationWithOptions is behaviourally identical to
GetGlobalMouse in these cases because the timeout was 0 and none of the
other out params were used, except for the MouseTrackingResult in one
call was checked against kMouseTrackingTimedOut. Since the timeout was 0
and not kEventDurationForever, that value never could have been returned
anyway.
Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h
is included on OS X. These types were wrong in 64-bit mode because of
this, causing type redefinition errors.
2014-10-15 19:29:49 -07:00
38718a362f
Enable drag and drop by default #4122
...
Remove premium login from GUI
2014-10-15 14:57:28 +01:00
aeab72f724
Apply patch from https://github.com/synergy/synergy/issues/3749
2014-10-15 14:51:44 +02:00
7e562273d5
[no-issue]
...
revert to r2421
2014-09-15 15:17:07 +00:00
1805dd7900
issue #575 - Cannot build x86_64 or ppc64 on Mac OS X
...
applied patch by Jake Petroules
2014-09-15 13:04:43 +00:00
Jerry (Xinyu Hou)
Nye Liu
j2gl
Nick Bolton
Adam Potolsky
Adam Potolsky
kahiroka
Maxim Doucet
Tom Sparrow
Nigel Armstrong
Johannes Weiser
jpmcmu
Josh McCullough
Michael Wilson
the-wes
Vasily Galkin
chris
chris
Jake Petroules
Jean-Philippe Andre
SeokYeon Hwang
Patrick Decat
jerry