Commit Graph

1522 Commits

Author SHA1 Message Date
Andrew Nelless 6d5b2707c8 #3305 Add logging for unknown macOS events 2016-09-26 11:58:33 +01:00
Xinyu Hou a17779e7fd #123 Disabled clipboard grab mechanism when clipboard is disabled 2016-09-26 11:58:33 +01:00
Xinyu Hou ce4effa2c8 #123 Fixed warning on Linux 2016-09-26 11:58:33 +01:00
Xinyu Hou eafc548b97 #123 Made disable clipboard take effect on client 2016-09-26 11:58:33 +01:00
Xinyu Hou 90673e8b87 #123 Added note about disabling clipboard 2016-09-26 11:58:33 +01:00
Xinyu Hou 59e31c3f05 #123 Made clipboard name convention consistent 2016-09-26 11:58:33 +01:00
Xinyu Hou 673829f511 #123 Made disable clipboard take effect on server 2016-09-26 11:58:33 +01:00
Xinyu Hou 9c0bac7c7d Fixed indentations 2016-09-26 11:58:33 +01:00
Xinyu Hou 3c94310c9e #123 Read clipboard sharing option and pass it to all clients 2016-09-26 11:58:33 +01:00
Xinyu Hou 130458f77a #123 Added enable clipboard option in GUI 2016-09-26 11:58:33 +01:00
Xinyu Hou d78758ab7d Fixed indentation 2016-09-26 11:58:33 +01:00
Xinyu Hou dc80ab4023 #4740 Sent heartbeat message between each chunk message 2016-09-26 11:58:33 +01:00
Xinyu Hou d8ace7fb4a #4740 Used global const rather than macro 2016-09-26 11:58:33 +01:00
Xinyu Hou 8ab69a22ae #4740 Forced delay on heartbeat rather than each clipboard chunk 2016-09-26 11:58:33 +01:00
Xinyu Hou d14d907ac1 #4740 Removed clipboard interrupt code 2016-09-26 11:58:33 +01:00
Andrew Nelless fc6ce84ee4 Don't pollute the log with clipboard data at DEBUG2 2016-09-26 11:58:33 +01:00
Xinyu Hou ceecee0f57 #4740 Used safer static cast 2016-09-26 11:58:33 +01:00
Xinyu Hou 71741da721 #4740 Only adopted non-SSL socket 2016-09-26 11:58:33 +01:00
Xinyu Hou 07f7baf335 #4740 Passed IDataSocket directly 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 61c0bd1910 Removed unused variable 2016-09-26 11:58:33 +01:00
XinyuHou f2846b1586 Remove disconnect on retry exceed 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 16dbb7cd6a Fixed using the wrong variable name 2016-09-26 11:58:33 +01:00
XinyuHou a471bdcea7 Made a own copy of ClientArgs in Client 2016-09-26 11:58:33 +01:00
XinyuHou a12ae98e9f Used parent pointer for socket accept 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) e1be5a66b7 Used correct event target 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 6d86a6033f Removed dead code 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) e0819b86cd Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 07902d623c Removed dead code 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 08a73218e6 Refactored secure read and write into SecureSocket 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 61b489ab3d Refactor write and read into functions 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 436e333f6f Fixed indentations 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 3df75f9601 Conflicts:
src/lib/server/ClientListener.cpp
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) e1be67cfb6 Fixed indentations
Conflicts:
	src/lib/client/Client.h
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 95464d97cf Conflicts:
src/lib/client/Client.cpp
	src/lib/net/TCPSocketFactory.cpp
2016-09-26 11:58:33 +01:00
XinyuHou e32402b5c6 #4740 Moved clipboard transfering back into main thread on server 2016-09-26 11:58:33 +01:00
XinyuHou 4ad2c6b10d #4740 Moved clipboard transfering back into main thread on client 2016-09-26 11:58:33 +01:00
XinyuHou 82043ca435 #4740 Used the same chunk size for secure and non-secure sockets 2016-09-26 11:58:33 +01:00
XinyuHou 3e1a86c3c1 #5502 Reverted disabled sending clipboard on inactive grab
This reverts commit 2ad4b896f3.
2016-09-26 11:58:33 +01:00
Cédric Picard 11d5691bca Fixed memory leak in IpcReader.cpp 2016-09-26 11:58:33 +01:00
Andrew Nelless d34a59a984 Update company name in win32 installer 2016-09-26 11:58:33 +01:00
Andrew Nelless c3c0913633 Update company copyright notice 2016-09-26 11:58:33 +01:00
Andrew Nelless 36be2051c2 Change company domain name 2016-09-26 11:58:33 +01:00
Andrew Nelless 7d11004575 #4768 Expand scope of X display lock in getCurrentTime() 2016-09-26 11:58:33 +01:00
XinyuHou 47ea124c77 #2765 Used EXPECT_FALSE instead of EXPECT_EQ 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) de91be1035 #2765 Added unit tests for KeyMap 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 2ffaf42faa #2765 Made index output 1 based 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) adaf325e6f #2765 Made sure extra sensitive modifier is not down on exact match 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) b80760bb2d #2765 Matched exactly only when all required modifiers are ready down 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 178b7cc673 #2765 Made sure required modifiers already down when map command keys 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) bbb652e504 #2765 Added unit test for modifier mapping 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 7a0fae2f6c #2765 Fixed wrong bit shifting to match OSX modifier mask 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 57950d39a3 Revert "Revert "Used input source ID as the key in group map #2765""
This reverts commit a70cba80ea.
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) c772a59572 Revert "Revert "Made index 1 based in log #2765""
This reverts commit fec53e812f.
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) f4bd2dab82 #3305 Fixed class name convention for Mac and Linux 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) cc10e319d1 #3305 Resolved namespace issue 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) b27a59fb0d #3305 Fixed class name convention from porting code 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) df8443e795 #3305 Fixed Linux key types incompatible issue 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 1a4a313ece #3305 Added mission control and launchpad support 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) ab4f59eac4 #3305 Made Mac clients aware of brightness keys 2016-09-26 11:58:33 +01:00
Xinyu Hou (Jerry) 67f14da691 #3305 Added brightness up and down support 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) b62de406e2 #3305 Refactor MockKeyState into a separate class 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) 82d2a9564e #3305 Made mock match to the original KeyState 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) bd0d8e7321 #3305 Added default implementation for fakeMediaKey for Linux and Mac 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou) d9a6c14170 #3305 Used Mac native way to simulate media keys 2016-09-26 11:58:33 +01:00
Andrew Nelless e72e86c9b2 #4323 Fix build wrt ElevateMode on non-Windows platforms 2016-09-26 11:58:33 +01:00
Andrew Nelless 21df3290c2 #4323 Refactored ElevateMode into its own header 2016-09-26 11:58:33 +01:00
Andrew Nelless 9c26c7ea94 #4323 Implement Elevate tristrate in GUI 2016-09-26 11:58:33 +01:00
Andrew Nelless 3cd58f7c7d #4323 Prepare settings dialog for elevation tristate 2016-09-26 11:58:33 +01:00
Andrew Nelless bb3be59c91 #4978 Link Bonjour statically 2016-08-09 10:04:32 +01:00
Andrew Nelless 342b3d1e8d #4978 Fixed WiX configuration order 2016-08-08 16:42:34 +01:00
Jerry (Xinyu Hou) 4ad8621adc #5389 Added qwindows.dll into installer on Windows 2016-08-08 16:42:34 +01:00
Jerry (Xinyu Hou) 9897711967 #4978 Increased wizard version 2016-08-08 16:42:34 +01:00
Andrew Nelless f7d8ea9686 #5390 Add --skip-tests config option 2016-08-08 16:41:01 +01:00
XinyuHou c5d5d5cba0 #4978 Made VersionHelper Windows specific 2016-08-08 16:41:01 +01:00
Andrew Nelless e1432f670c #4978 Fixed bad casting on 64bit Windows 2016-08-08 16:41:01 +01:00
Andrew Nelless 04184b51ea #4978 Removed deprecated usage of GetVersionEx 2016-08-08 16:41:01 +01:00
Andrew Nelless 3ead310161 #4978 Fixed HANDLE string formatting on 64bit Windows 2016-08-08 16:41:01 +01:00
Andrew Nelless bc24568a6f #4978 Removed deprecated GetVersionEx call when checking Windows version 2016-08-08 16:41:01 +01:00
Andrew Nelless 74c48c6516 #4978 Removed getOSName impl relying on deprecated GetVersionEx 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) cf1e5239cb #5389 Output GUI binary to release folder on Windows 2016-08-08 16:41:01 +01:00
Jake Petroules 433cfc232c #4978 Removed obsolete code for unsupported OS versions. 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 76a776ef86 #4978 Fixed warning 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) d37d3e8944 #4978 Replaced the superseded SetWindowLong API 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 454bf4dc5f #5389 Updated Wix for Qt 5.6 and VS 2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 70bdbe2736 #4978 Removed hack causing problems with VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless cd09a36286 #4978 Fixed orphaned appendLogInfo slot 2016-08-08 16:41:01 +01:00
Andrew Nelless 38db630816 #5389 Added missing header under Qt5 2016-08-08 16:41:01 +01:00
Andrew Nelless 79a61b28f4 #5389 Added Qt5 compatibility for default file paths 2016-08-08 16:41:01 +01:00
Andrew Nelless 64dbae8918 #4978 Resolved conflict between interface macro in VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 6c58913899 #5389 Support for building GUI with VS2015 2016-08-08 16:41:01 +01:00
Andrew Nelless 1bb1b21f77 #4978 Renamed conflicting 'Unknown' EditionType 2016-08-08 16:41:01 +01:00
Andrew Nelless 13e8047967 #4978 Conditional linking C runtime lib 2016-08-08 16:41:01 +01:00
Andrew Nelless c2b6b60cec #4978 Compile core on VS2015 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 42494a72a5 #3305 Fixed class name convention for Mac and Linux 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) ba04f2dfc5 #3305 Resolved namespace issue 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 10a1ae8271 #3305 Fixed class name convention from porting code 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) e742269ada #3305 Fixed Linux key types incompatible issue 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 8f99911636 #3305 Added mission control and launchpad support 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 1f78fe6f6d #3305 Made Mac clients aware of brightness keys 2016-08-08 16:41:01 +01:00
Xinyu Hou (Jerry) 8058ed06a1 #3305 Added brightness up and down support 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) ebfe01cb3b #3305 Refactor MockKeyState into a separate class 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) e2459eb1b7 #3305 Made mock match to the original KeyState 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) d3814cc454 #3305 Added default implementation for fakeMediaKey for Linux and Mac 2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou) 9115d5570b #3305 Used Mac native way to simulate media keys 2016-08-08 16:41:01 +01:00
Andrew Nelless e1e1199a57 #4323 Fix build wrt ElevateMode on non-Windows platforms 2016-08-08 16:41:01 +01:00
Andrew Nelless d42ea08a1d #4323 Refactored ElevateMode into its own header 2016-08-08 16:41:01 +01:00
Andrew Nelless fa9f30ff81 #4323 Implement Elevate tristrate in GUI 2016-08-08 16:41:01 +01:00
Andrew Nelless d1e80c668e #4323 Prepare settings dialog for elevation tristate 2016-08-08 16:41:01 +01:00
Andrew Nelless f6e1dd51fa #4768 Workaround locking issue in X11 getCurrentTime() 2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou) 7fa92869a4 #5471 Wrapped skip explanation in wizard activation page 2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou) 03d22c3746 #5471 Fixed typo in activation wizard page 2016-08-08 14:38:26 +01:00
Andrew Nelless 8a4caba386 #5087 Ensure createBlankCursor() doesn't try to create 0x0 cursor
XQueryBestCursor sometimes returns 0 for both width and height of the
cursor pixmap. Also caused #5322 and #5068
2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou) 47ef8b09bd #4768 Reset thread when it finishes 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 804b482c5e #5471 Added some tips and size restrictions 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 725cc7a2f8 #4922 Increased server help message buffer 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 683d9b3786 Revert "Check list in a reverse order #2765"
This reverts commit 3de98a2f44a20449468496d47f5642b534a80cf6.
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) fec53e812f Revert "Made index 1 based in log #2765"
This reverts commit 177c2764259c097d0f0f0fa6e081c42bcef91ce5.
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) a70cba80ea Revert "Used input source ID as the key in group map #2765"
This reverts commit 4208e89eaec211d332af9ac7b977107d6712e8dd.
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 2a3d34983f #4715 Increased wizard version number due to serial key support 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 2ad4b896f3 #4768 Disabled sending clipboard on inactive grab 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 62c9ca0a7f #5471 Redesigned serial key input 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) fd39c73bcd #5471 Made serial key form layout align to left 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 83c0dea2e4 #4792 Calculated log message size rather than using fixed size 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 18c2c90144 #3044 Stopped attach hook thread to foreground 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 9caa04237c Refined file transfer log output 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou) 30fa5223bc #4768 Fixed race condition on active client proxy switch 2016-08-08 14:36:42 +01:00
Jerry (Xinyu Hou) 1a76acd446 #4768 Interrupted both clipboards 2016-08-08 14:36:42 +01:00
Jerry (Xinyu Hou) 80292961ad Continue after close old process #5277 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) fa2a6a2169 Added restart service on failure #5277 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 17c35f53f4 Applied name convention to KeyResource #2765 2016-08-08 14:27:13 +01:00
Will Tinsdeall 47d6d1c5bc Improved grammar in connection notification dialog #4894 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 8003c4a2ad Made IKeyResource OSX specific #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 6d2040b698 Reorganised KeyResource #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 6d93a28c2e Used input source ID as the key in group map #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 583ac1ed2d Made index 1 based in log #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 7bf9ca44ae Check list in a reverse order #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 7f786cc884 Refactor KeyResource into own files #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) ed0888880c Rename CUCHRKeyResource to UchrKeyResource #2765 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 929431f5fc Remove support for OSX 10.4 and below #2765 2016-08-08 14:27:13 +01:00
Nigel Armstrong 6e7adeac85 Added "--enable-crypto" to help #4922 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 60b56f9e58 Switch translator back only when it's been changed #4836 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 48d24d72e6 Proofread internal information after retranslating UI #4836 2016-08-08 14:27:13 +01:00
Asbjorn Kjaer c7e723030b Fix log string to use the re-mapped button instead of the input ID #2975 2016-08-08 14:27:13 +01:00
Asbjorn Kjaer d93ff2f53f Fix comment #2975 2016-08-08 14:27:13 +01:00
Asbjorn Kjaer 5901fa8aed Correctly translate mouse events to the right and middle buttons #2975 2016-08-08 14:27:13 +01:00
Amanda McGlothlin aa178a356f Updated mac app icon to match the website icon #5299 2016-08-08 14:27:13 +01:00
Will Tinsdeall 428901859e Use account in auth url #4913 2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou) 0034ca4b76 #5461 Caught all exceptions for activation 2016-07-12 06:51:09 -07:00
Erik Swan 5e35fe2c1b Fix mouse speed increase with sleep on Mac server
As reported in #451, with the Mac server, sleeping and resuming (on the
server) causes the mouse speed to double on the client upon resume.

Fix by removing the CFRunLoopSource from the run loop on screen disable
before releasing it. CFRunLoopAddSource in enable() retains the
CFRunLoopSource, so even though the source is released in disable(), the
run loop still has a copy. When the server comes out of sleep and the
screen is enable()'d, another event tap and run loop source are created
and added to the run loop, so the callback is now being called twice for
every mouse movement, and so on for every additional time the server
sleeps.

This is a better approach than the fix in 267f3ac41f, because although
that fixes the issue by disabling the event tap before the event tap and
run loop source are released, a memory leak still occurs since they are
retained by the run loop.

Additional references on the behavior of CFRunLoopAddSource:
https://developer.apple.com/library/mac/documentation/CoreFoundation/Reference/CFRunLoopRef/index.html#//apple_ref/c/func/CFRunLoopAddSource
http://www.cocoabuilder.com/archive/cocoa/242438-trouble-with-event-taps.html
2016-03-15 12:57:54 -07:00
Jerry (Xinyu Hou) 7cbd3fdcb4 Revert "Add keepAlive message before send file/clipboard data #4768"
This reverts commit 5287c62540b277474603ea8a38c53b50cb8f4d52.
2016-03-15 12:57:39 -07:00
Jerry (Xinyu Hou) b5b2cdfade Add keepAlive message before send file/clipboard data #4768 2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) 5661a41d42 Fix code style 2016-03-15 12:57:06 -07:00
XinyuHou e5c1821088 Outpup log before return #4740 2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) 3ce078f0e8 Fix wrong elevate information #5041 2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) 70104190e4 Add elevate log info #5041 2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) 20d9b80291 Remove checking system clipboard formats #5041 2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) 1ac8db56d9 Revert "Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates"
This reverts commit beac70f90c37b626cb7b0ea7bf2d18fdd3729013.
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) 92a3c47ed2 Revert "Issue #5041 - properly update activeDesk and activeDeskName when screen saver activates"
This reverts commit 3615add7b80838dc8b93cb89f2c8f87254db6c21.
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou) da5e9527a3 Revert "Refactor Issue #5041 workaround to make sure we still send the SCREENSAVER message"
This reverts commit 43ba3e889f88e526673ff70caf2b3efe26b13363.
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 4d19941428 Revert "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."
This reverts commit 38209e5079d1695ddd561f8045647e077fccff91.
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 42038ce24e Revert "Minor cosmetic change - missing some debug stuff in this branch."
This reverts commit bd660fedbfbff2df1bf5921826dd7717c2839161.
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 89eb64a0aa Reorder clipboard format #2909 2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 4344b16a20 Remove some hack code #2909 2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 221a9a71c4 Add comment #4827 2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 6d0f820db5 Fix indentations 2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou) 3067560f7b Fix indentations 2016-03-15 12:57:04 -07:00
Jerry (Xinyu Hou) ee20d08080 Revert "Revert "Fixed using wrong local variable #4723""
This reverts commit a0beae0f4b5578a16178e6324f2d1f588caeb442.
2016-03-15 12:51:42 -07:00
Jerry (Xinyu Hou) 5fae9efe78 Revert "Revert "Added timeout for waiting active destop result #4723""
This reverts commit 0f8a5687719605af59d901f08dfbb5dde74a7dc9.
2016-03-15 12:51:42 -07:00
Jerry (Xinyu Hou) eb36db6c26 Revert "Revert "Fix missing DLLs after install #3774""
This reverts commit b575d7ca35d51d1c28ffb84b19fdf96fc941fe41.
2016-03-15 12:51:42 -07:00
Jerry (Xinyu Hou) 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
Nye Liu 6f904e55f1 Minor cosmetic change - missing some debug stuff in this branch. 2016-03-15 12:47:34 -07:00
Nye Liu 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
Nye Liu 425fc8b925 Refactor Issue #5041 workaround to make sure we still send the SCREENSAVER message 2016-03-15 12:47:33 -07:00
Nye Liu 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
Nye Liu 1fc28392d0 Add error message to help debug Issue #5041 2016-03-15 12:47:33 -07:00
Nye Liu 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
Nye Liu 48069f1a3b Always call wait() at least once even if timeout is 0 to prevent deadlocks 2016-03-15 12:46:45 -07:00
Nye Liu b85b9125ea Remove inadvertent additions 2016-03-15 12:46:45 -07:00
Nye Liu 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
Nye Liu 1fde0f3e71 Cosmetic whitespace, use return value of wait() directly instead of testing timer 2016-03-15 12:46:45 -07:00
Nye Liu 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
Nye Liu 6c11de6a22 Fix bug #4735 - don't leave() until fillClipboard()s all complete 2016-03-15 12:46:45 -07:00
Jerry (Xinyu Hou) 0207b697e3 Remove debug logging #5030 2015-11-30 12:01:00 -08:00
Jerry (Xinyu Hou) 42f201785c Revert "Added timeout for waiting active destop result #4723"
This reverts commit aec52c36e6.
2015-11-24 11:53:38 -08:00
Jerry (Xinyu Hou) 539ac32136 Revert "Fixed using wrong local variable #4723"
This reverts commit d7063a87c8.
2015-11-24 11:53:18 -08:00
Jerry (Xinyu Hou) 622045b396 Revert "Revert "Revert "Fix missing DLLs after install #3774"""
This reverts commit 3eb04d1b4c.
2015-11-24 11:42:17 -08:00
Jerry (Xinyu Hou) 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
Jerry (Xinyu Hou) 3bca8deac3 Use secure URL #4715 2015-11-23 11:42:47 -08:00
Jerry (Xinyu Hou) 953ad5bc4a Use live URL #4715 2015-11-23 10:03:44 -08:00
Jerry (Xinyu Hou) fbd2c1413e Merge branch 'jerry-sandbox2' 2015-11-23 09:54:05 -08:00
j2gl 5a03ece50b Update MacOS warning 2015-11-20 01:35:23 -06:00
Jerry (Xinyu Hou) fa8a0ebbfe Make center point be aware of DPI scaling #5030 2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou) df89859400 Fix indentation 2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou) c259af9b41 Fix code style 2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou) 4f1f2dcff0 Use condition instead of assertion #5030 2015-11-19 13:46:48 -08:00
XinyuHou ebec92fd5b Fix unit test failed compiling on Linux #5030 2015-11-19 13:46:47 -08:00
XinyuHou af305ba3df Add size_t dependency #5030 2015-11-19 13:46:47 -08:00
Jerry (Xinyu Hou) c23d443a9a Add unit tests for DpiHelper 2015-11-19 13:46:47 -08:00
Jerry (Xinyu Hou) 0cc831b2fb Fix code style 2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou) c994b0a4f7 Make sure all variables are non zero #5030 2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou) a09bfc5f07 Fix high DPI breaking edge detection and mouse delta calculation #5030 2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou) 66335cd6f8 Pass resolution and center into core on Windows #5030 2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou) 1ccc258455 Add DPI helper #5030 2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou) 4be852c2f2 Move notify into thread #4932 2015-11-19 10:48:11 -08:00
Jerry (Xinyu Hou) e1e38bd3a2 Compress network error during notification #4932 2015-11-19 10:01:50 -08:00
Jerry (Xinyu Hou) 4b2fc8c4c9 Refactor function name #4715 2015-11-18 16:05:08 -08:00
Jerry (Xinyu Hou) cab8a99233 Persist Profile folder #4715 2015-11-18 16:03:32 -08:00
Jerry (Xinyu Hou) 0e58bfc5fe Remove user token #4715 2015-11-18 15:09:09 -08:00
Jerry (Xinyu Hou) b1c5a83bfb Uthe edition value in app config as default #4715 2015-11-18 15:05:05 -08:00
Jerry (Xinyu Hou) 20d4d47648 Save edition type to settings after wizard finish #4715 2015-11-18 15:03:06 -08:00
Jerry (Xinyu Hou) 4698394e21 URL encode identity and MAC address 2015-11-18 11:51:45 -08:00
Jerry (Xinyu Hou) 5f73d339aa Refactor purchase url #4716 2015-11-17 15:20:22 -08:00
Jerry (Xinyu Hou) 7ecc0457e0 Show subscription warning once a day #4716 2015-11-17 14:51:04 -08:00
Jerry (Xinyu Hou) f8e9047c36 Rephrase and refactor serial warning message #4716 2015-11-17 14:17:00 -08:00
Jerry (Xinyu Hou) 18d23d6f89 Rephrase using serial recommendation #5020 2015-11-17 10:41:24 -08:00
Jerry (Xinyu Hou) 97809f9040 Revert "Modify regex to recognize edition from jason #4933"
This reverts commit 2fd0d5c68f.
2015-11-16 09:24:49 -08:00
Jerry (Xinyu Hou) 2fd0d5c68f Modify regex to recognize edition from jason #4933 2015-11-13 11:04:23 -08:00
Jerry (Xinyu Hou) ad16599fa5 Fix code style 2015-11-12 12:05:37 -08:00
Jerry (Xinyu Hou) 4b7796d215 Catch exception from notification request #4932 2015-11-12 12:05:26 -08:00
Jerry (Xinyu Hou) 8c4ccdf148 Unit test for new fields in serial key #4715 2015-11-12 10:08:55 -08:00
Jerry (Xinyu Hou) 55df81b1a6 Add company and email into serial key #4715 2015-11-12 10:08:35 -08:00
Jerry (Xinyu Hou) 9eec299278 Check user type from serial key #4715 2015-11-12 09:50:30 -08:00
Jerry (Xinyu Hou) 4c1b6f3f23 Use test website #4932 2015-10-30 13:49:18 -07:00
Jerry (Xinyu Hou) 10e3917b61 Change notify failure log level #4932 2015-10-30 13:42:05 -07:00
Jerry (Xinyu Hou) 382607129c Make notify failure silent #4932 2015-10-30 12:43:28 -07:00
Jerry (Xinyu Hou) bdc02677ec Add trial edition type #4716 2015-10-30 11:57:12 -07:00
Jerry (Xinyu Hou) 73ac3df22d Limit expired time to trial version #4716 2015-10-30 11:41:51 -07:00
Jerry (Xinyu Hou) 068b3b98ed Fix compile warnning #4933 2015-10-30 11:25:16 -07:00
Jerry (Xinyu Hou) 0a1c439535 Only send notify request on wizard finish #4932 2015-10-29 16:50:23 -07:00
Jerry (Xinyu Hou) f03b453c6f Pass Linux OS info during notification #4932 2015-10-29 15:55:55 -07:00
Jerry (Xinyu Hou) b4563a42c4 Use string split function in syntool #4933 2015-10-29 15:47:10 -07:00
Jerry (Xinyu Hou) 942dcabdcd Add split empty string unit test #4933 2015-10-29 15:11:09 -07:00
Jerry (Xinyu Hou) c148fbb7f4 Fix unit tests name convention #4933 2015-10-29 13:08:00 -07:00
Jerry (Xinyu Hou) d429988e73 Add more unit tests for split string function #4933 2015-10-29 13:00:03 -07:00
Jerry (Xinyu Hou) 1b73b8875b Add unit tests for split string function #4933 2015-10-29 12:53:15 -07:00
Jerry (Xinyu Hou) 72397137c0 Add split string function #4933 2015-10-29 12:52:55 -07:00
Jerry (Xinyu Hou) 27f83e1801 Refactor duplicated code #4933 2015-10-29 11:42:16 -07:00
Jerry (Xinyu Hou) 582629e968 Use the passed in OS info if specified #4933 2015-10-28 17:29:42 -07:00
XinyuHou 2535f3466c Check OS info from GUI #4933 2015-10-28 17:15:16 -07:00
Jerry (Xinyu Hou) d4d5d83bb6 Check OS info from GUI #4933 2015-10-28 14:09:04 -07:00
Xinyu Hou a4c799c285 Notify activation when skipping or using serial #4932 2015-10-27 16:31:09 -07:00
Xinyu Hou 4d20a3ce91 Add OS and arch in auth request #4933 2015-10-27 15:50:34 -07:00
Xinyu Hou 32da441fc0 Simplify OS info on Unix #4933 2015-10-27 15:45:39 -07:00
Jerry (Xinyu Hou) 19835b6aaa Allow software to be time limited with serial key #4716 2015-10-23 15:37:16 -07:00
Jerry (Xinyu Hou) 75adb5aa8d Recommend using serial key when online activation fails #5020 2015-10-23 12:13:16 -07:00
Jerry (Xinyu Hou) 98385c06e9 Use local variable instead of function parameter #5020 2015-10-23 11:59:28 -07:00
Jerry (Xinyu Hou) da315ec164 Add unit tests for subscription manager #4715 2015-10-23 11:35:58 -07:00
Jerry (Xinyu Hou) 978c97cbc0 Refactor parse plain serial #4715 2015-10-23 11:35:57 -07:00
XinyuHou 0429986470 Add dependency for Linux #4715 2015-10-22 16:41:48 -07:00
Jerry (Xinyu Hou) bc768cbca3 Add serial key in app settings #4715 2015-10-22 16:31:46 -07:00
Jerry (Xinyu Hou) 3bc46dca2d Use core interface to activate subscription in wizard #4715 2015-10-22 16:14:37 -07:00
Jerry (Xinyu Hou) 85ef7935cc Rename a variable 2015-10-22 16:04:05 -07:00
Jerry (Xinyu Hou) 1f54dd2d3b Remove unused code 2015-10-22 16:03:27 -07:00
Jerry (Xinyu Hou) ca0237dcc7 Remove legacy subscription checking #4715 2015-10-21 17:48:44 -07:00
Jerry (Xinyu Hou) a29858c439 Add subscription section in activation page #4715 2015-10-21 17:06:38 -07:00
Jerry (Xinyu Hou) 18e7004213 Add subscription functionalities in syntool #4715 2015-10-21 16:35:22 -07:00
Jerry (Xinyu Hou) 8f941f5713 Port subscription feature #4715 2015-10-21 16:00:23 -07:00
Jerry (Xinyu Hou) 83876ebed4 Removed legacy class #4696 2015-10-20 14:36:28 -07:00
Jerry (Xinyu Hou) 084e2c1e05 Refactor FileSysClient into PluginManager #4696 2015-10-19 18:07:08 -07:00
Jerry (Xinyu Hou) 6c4ee29649 Remove unused functions in WebClient #4696 2015-10-19 17:02:59 -07:00
Jerry (Xinyu Hou) 4197fb7a0e Remove unused viable #4696 2015-10-19 16:59:25 -07:00
Jerry (Xinyu Hou) d61b532705 Add built date #4893 2015-10-19 16:06:02 -07:00
Xinyu Hou 6320156279 Add stage and revision info in about page #4893 2015-10-19 15:15:03 -07:00
Jerry (Xinyu Hou) 5da7290242 Stopped process before showing the fingerprint message #4901 2015-08-10 10:11:51 -07:00
Jerry (Xinyu Hou) 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
Xinyu Hou 9b09703c1a Revert "Allowed reconnect after SSL fatal error #4857"
This reverts commit cbd63e9d67ead4199d5ab49b17d68a7583421d92.
2015-08-06 12:55:59 -07:00
Xinyu Hou 95c9ffe7e8 Removed unused variable #4866 2015-08-03 16:38:42 -07:00
Jerry (Xinyu Hou) 5b1e7acca9 Plugin version to 1.3 2015-08-03 16:29:36 -07:00
Jerry (Xinyu Hou) c55cf1936b Added plugin version header in GUI project #4866 2015-08-03 16:28:13 -07:00
Jerry (Xinyu Hou) 0f4837aa21 Fixed warning on Mac 10.6 #4866 2015-08-03 15:56:39 -07:00
Jerry (Xinyu Hou) 945ccfdb75 Refactored plugin names #4866 2015-08-03 15:56:21 -07:00
Xinyu Hou b105bc8f42 Unified secure socket name across platforms #4866 2015-08-03 15:56:03 -07:00
Xinyu Hou fedad2b8a1 Improved plugin version logging for Unix #4866 2015-08-03 15:55:37 -07:00
Nick Bolton 3eb1bffb70 Improved variable name for plugin loading on Windows #4866 2015-08-03 15:51:53 -07:00
Nick Bolton cb5f0f7b12 Improved plugin version logging for Windows #4866
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
2015-08-03 15:51:27 -07:00
Jerry (Xinyu Hou) bfabd436d7 Increased wizard version to force plugin download #4866 2015-08-03 15:48:44 -07:00
Jerry (Xinyu Hou) dc72b4e512 Changed plugin version mismatch log level to error #4866 2015-08-03 15:46:47 -07:00
Jerry (Xinyu Hou) 6602ebe435 Refactored adding plugin only after loaded #4866
Conflicts:
	src/lib/arch/unix/ArchPluginUnix.cpp
2015-08-03 15:45:31 -07:00
Xinyu Hou a99699df7a Only loaded matching plugin on Mac #4866
Conflicts:
	src/lib/arch/unix/ArchPluginUnix.cpp
2015-08-03 15:43:54 -07:00
Jerry (Xinyu Hou) 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
Jerry (Xinyu Hou) 02902066a4 Removed the usage of old delay in GUI #4696 2015-07-31 14:15:28 -07:00
Xinyu Hou dbdc2a1e29 Solved fingerprint message box race condition #4901 2015-07-31 14:00:26 -07:00
Xinyu Hou 0612ba585d Stopped multiple fingerprint message boxes popping up #4910 2015-07-31 14:00:26 -07:00
Jerry d70c19b099 Stopped old process before start a new one #4908 2015-07-31 14:00:26 -07:00
Xinyu Hou e472e47815 Stopped old process on apply button clicked #4908 2015-07-31 14:00:26 -07:00
Xinyu Hou 20cb624c3b Used timer instead of delay #4901 2015-07-31 13:59:25 -07:00
Xinyu Hou 08effbcf99 Fixed code style #4901 2015-07-31 13:59:25 -07:00
Xinyu Hou 67fbecb825 Fixed auto restart sometimes cause GUI crash #4901 2015-07-31 13:59:01 -07:00
Xinyu Hou 94664e413b Rename update zeroconf mutex 2015-07-31 13:58:47 -07:00
Xinyu Hou fc600efdfe Restarted process from GUI in desktop mode #4901 2015-07-31 13:58:18 -07:00
Jerry (Xinyu Hou) 86d5567e74 Removed redundant logging #4721 2015-07-31 13:57:18 -07:00
Jerry (Xinyu Hou) 5d61996405 Fixed code style #4712 2015-07-31 13:56:58 -07:00
Xinyu Hou 1659f9f018 Added keep alive massge before each data transfer #4712 2015-07-31 13:56:33 -07:00
Jerry (Xinyu Hou) de49b46edd Expected hasClients at least 3 times #4721 2015-07-31 13:56:19 -07:00
Jerry (Xinyu Hou) 9d44affc89 Fixed Ipc unit test intermittently fail #4721 2015-07-31 13:56:10 -07:00
Jerry (Xinyu Hou) 1369f46cee Show connected message box only when main GUI is visible #4850 2015-07-31 13:55:52 -07:00
Jerry (Xinyu Hou) 7259e71439 Reset thread back to null on finish #4712 2015-07-31 13:55:35 -07:00
Jerry (Xinyu Hou) bfc3ac340f Fixed possible loss of data warning #4677 2015-07-31 13:55:23 -07:00
Jerry (Xinyu Hou) a5c865913f Added expect call time for hasClients #4721 2015-07-31 13:55:09 -07:00
Jerry (Xinyu Hou) c3d38db053 Made buffer thread wait for notify when no gui #4721 2015-07-31 13:55:00 -07:00
Jerry (Xinyu Hou) 18a6f75371 Fixed dialog too big #4852 2015-07-31 13:54:26 -07:00
Jerry (Xinyu Hou) 516c692c94 Removed unused function #4745 2015-07-31 13:54:09 -07:00
Jerry (Xinyu Hou) 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
Jerry (Xinyu Hou) 01526bbe78 Revert "Removed unrelated checking #4721"
This reverts commit 2de276cfca71a79df31a1d4a89d412212279a1a5.
2015-07-31 13:52:47 -07:00
Xinyu Hou 5a9cbc97e3 Fixed code style
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
2015-07-31 13:51:48 -07:00
Xinyu Hou 88214a0d3c Removed unrelated checking #4721 2015-07-31 13:49:42 -07:00
Xinyu Hou 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
Jerry (Xinyu Hou) cc3dc315f9 Allowed reconnect after SSL fatal error #4857 2015-07-31 13:46:35 -07:00
Jerry (Xinyu Hou) a44e9832c5 Refactored code order to make it more readable 2015-07-31 13:46:23 -07:00
Jerry (Xinyu Hou) 9800bec857 Made clipboard log more consistent #4712 2015-07-31 13:46:11 -07:00
Jerry (Xinyu Hou) c2b96cfbb7 Updated comment #4750 2015-07-31 13:45:46 -07:00
Jerry (Xinyu Hou) d51eb7b8b5 Fixed code style 2015-07-31 13:42:51 -07:00
Jerry (Xinyu Hou) f8bb948776 Removed unused variable #4750 2015-07-31 13:42:41 -07:00
Jerry (Xinyu Hou) 0ddf544efb Used static variable than define #4750
Conflicts:
	src/lib/plugin/ns/SecureSocket.cpp
2015-07-31 13:25:03 -07:00
Jerry (Xinyu Hou) 44966ee17f Removed redundant log #4858 2015-07-31 13:22:50 -07:00
Jerry (Xinyu Hou) 4fe46e117e Shorten data transfer log #4858 2015-07-31 13:20:50 -07:00
Jerry (Xinyu Hou) 485547d6ea Reverted Notify back to note #4855 2015-07-31 13:20:35 -07:00
Jerry (Xinyu Hou) 81649376fa Revert "Added symbolic link creation to linux and macos #4696"
This reverts commit ad9cfd64af.

Conflicts:
	src/gui/src/PluginManager.cpp
2015-07-31 13:20:16 -07:00
Jerry (Xinyu Hou) a8cf9173c8 Revert "Changed note to notify #4745"
This reverts commit 5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp
2015-07-31 13:19:17 -07:00
Jerry (Xinyu Hou) 69a6038cf9 Revert "Moved note into either warning or info #4745"
This reverts commit d3a4ce1f11.
2015-07-31 13:18:57 -07:00
Jerry (Xinyu Hou) d8582d1093 Revert "Removed warning and error logging level in GUI #4745"
This reverts commit 756000d8a9.

Conflicts:
	src/gui/res/SettingsDialogBase.ui
	src/gui/src/AppConfig.cpp
	src/gui/src/MainWindow.cpp
2015-07-31 13:18:36 -07:00
Jerry (Xinyu Hou) c89dc68cd7 Revert "Added warning for enable encryption #4584"
This reverts commit 8e15b77db3.
2015-07-31 13:17:36 -07:00
Jerry (Xinyu Hou) 9483fecc42 Fixed code style
Revert "Moved note into either warning or info #4745"

This reverts
commit d3a4ce1f11.

Revert "Changed note to notify #4745"

This reverts commit
5006adedfe.

Conflicts:
	src/test/unittests/ipc/IpcLogOutputterTests.cpp

Shortened transmission log #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
Jerry (Xinyu Hou) 8ff44d276b Revert "Revert "Add drag and drop enable option to GUI settings""
This reverts commit 8676f64b96.
2015-07-09 17:05:43 -07:00
Jerry (Xinyu Hou) 3eb04d1b4c Revert "Revert "Fix missing DLLs after install #3774""
This reverts commit 7254e621e1.
2015-07-09 17:05:33 -07:00
Jerry (Xinyu Hou) 7254e621e1 Revert "Fix missing DLLs after install #3774" 2015-07-09 10:00:02 -07:00
Jerry (Xinyu Hou) 8676f64b96 Revert "Add drag and drop enable option to GUI settings" 2015-07-09 09:54:57 -07:00
Jerry (Xinyu Hou) cfec3a93f2 Fixed code style 2015-07-06 16:48:36 -07:00
Jerry (Xinyu Hou) 260a7337d3 Added timestamp in log #4845 2015-07-06 15:50:21 -07:00
Jerry 23739f8484 Prevented open clipboard twice #4815 2015-07-06 13:00:28 -07:00
Jerry (Xinyu Hou) 8a026e06bd Merge remote-tracking branch 'origin/v1.7.4-stable' 2015-06-30 15:43:39 -07:00
Jerry (Xinyu Hou) 44fa44fd1b Fixed using non existing function #4745 2015-06-30 15:05:24 -07:00
Xinyu Hou 00734c15b1 Removed notify log level in settings #4745 2015-06-30 22:45:48 +01:00
Xinyu Hou 85dc7a566e Made log consistent #4745 2015-06-30 03:37:36 +01:00
Xinyu Hou 6d5f997a1e Removed notification but use tray icon #4745 2015-06-30 01:42:08 +01:00
Jerry (Xinyu Hou) 673fba5846 Merge branch 'master' of https://github.com/synergy/synergy 2015-06-25 12:38:33 -07:00
Jerry (Xinyu Hou) 3aebb87b37 Fixed using old log level convention #4745 2015-06-25 11:25:58 -07:00
Adam Potolsky 9dc0a1d862 Added comment for clarity #4750 2015-06-25 09:54:28 -07:00
Adam Potolsky 25c1754d2d Merge branch 'master' into adam-sandbox 2015-06-25 09:46:21 -07:00
Adam Potolsky 4569de5413 Fixed misplaces statis string in windows code #4793 2015-06-25 09:44:16 -07:00
Adam Potolsky d7043ef84b Added plugin version output to unix builds #4793 2015-06-25 09:35:56 -07:00
Adam Potolsky 55a38ff8cc removed unnecessary flag settings, fixed wrong call. #4750 2015-06-24 17:57:22 -07:00
Adam Potolsky 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
Adam Potolsky 2df88e07c4 fixed retry logic for secure connect and accept #4750 2015-06-24 12:20:25 -07:00
Adam Potolsky e50b239592 Changed secure connest and accept to match read/write retry logic #4750 2015-06-24 11:11:20 -07:00
Adam Potolsky 6442bcb8f6 Change PluginWizardPage to take and use MainWindow instead of appConfig #4823 2015-06-23 17:11:39 -07:00
Adam Potolsky 19f5ad8cab Add delay routine to MainWindow to allow sleep in a Qt friendly way #4823 2015-06-23 17:10:49 -07:00
kahiroka 267f3ac41f workaround for Fast cursor on any client with Mac server #451 2015-06-19 17:20:26 -07:00
Adam Potolsky 121080be74 removed non-existant file from gui.pro to remove warning #4810 2015-06-18 14:45:41 -07:00
Adam Potolsky 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