Commit Graph

823 Commits

Author SHA1 Message Date
XinyuHou 06253c965b resolve #4328 by moving plugin into lib folder 2015-01-20 16:18:51 +00:00
XinyuHou a98c4bd02a made init function signature consistent #4313 2015-01-20 16:00:15 +00:00
Xinyu Hou 141b778477 refactored SecureSocket to use interface #4313 2015-01-14 17:25:53 +00:00
XinyuHou be2b87fd39 fixed code style 2015-01-12 10:51:16 +00:00
XinyuHou f973d1498d dropped prefix C 2015-01-12 10:33:29 +00:00
XinyuHou 7bff958422 added pluging loader for unix #4313 2015-01-09 13:47:35 +00:00
XinyuHou 1d7eb3f5cb updated pluging loader for Windows #4313 2015-01-09 13:46:35 +00:00
XinyuHou de8fe7e2a5 fixed compiler cast warning in drag info class 2015-01-06 14:51:37 +00:00
XinyuHou 95a1752396 ported secure socket class from enterprise to ns plugin #4313 2015-01-06 14:20:05 +00:00
XinyuHou a0f2261931 added new ns plugin #4313 2015-01-06 13:52:11 +00:00
Xinyu Hou 1f41b92693 Fixed client detected dialog not shown when Synergy is minimized #4307 2015-01-05 13:32:58 +00:00
the-wes 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
the-wes d62c4a842b Update App.h
update --help output.
2014-12-16 18:04:00 -08:00
the-wes a99bea9d3b clarify protocol error message 2014-12-05 16:59:39 -08:00
James McMullan 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
Xinyu Hou ebba77fd33 Suppressed empty server warning on startup #4240 2014-12-02 15:03:19 +00:00
Xinyu Hou db9f7974ed Fixed #4249 by add retain count for extension string 2014-12-02 12:36:01 +00:00
Xinyu Hou 774b217e8f Fixed typo #4247 2014-12-01 18:32:00 +00:00
Xinyu Hou 0d3f14adb9 Fixed name conflict #4247 2014-12-01 18:19:20 +00:00
Xinyu Hou b60608ece9 Fixed #4247 - Added firewall exception 2014-12-01 17:46:42 +00:00
Xinyu Hou 917c75026f Show add client dialog only if main window is active #4230 2014-12-01 11:22:42 +00:00
Xinyu Hou 48b552a0e8 Made auto config checked after Bonjour download #4235 2014-11-28 16:34:16 +00:00
Xinyu Hou e6e4f1b53d Deleted the download thread in a Qt way #4235 2014-11-28 15:23:08 +00:00
Xinyu Hou 17278f7224 Closed wizard then open mainwindow #4235 2014-11-28 15:01:23 +00:00
Xinyu Hou 4452f14114 Updated zeroconf after Bonjour is installed #4235 2014-11-28 12:57:57 +00:00
Xinyu Hou 00d6b23d57 Use auto config if Bonjour already installed #4240 2014-11-28 11:21:45 +00:00
Xinyu Hou 581d4c5469 Added a icon for download message box #4235 2014-11-28 10:54:51 +00:00
Xinyu Hou 216f0f160d Resolved #4242 keep auto config name consistent 2014-11-28 10:51:52 +00:00
Xinyu Hou 1730258311 Fixed wrong download message box title #4235 2014-11-27 19:11:01 +00:00
Xinyu Hou d448fb777b Merged 2 msgboxes into 1 when first startup #4240 2014-11-27 19:08:30 +00:00
Xinyu Hou a0cc3d6e7f Made Bonjour install in another thread #4235 2014-11-27 18:31:45 +00:00
Xinyu Hou af4817d075 Suppressed auto connect warning on startup #4240 2014-11-27 18:31:42 +00:00
Xinyu Hou 54e294bffb Improved auto connect massage #4237 2014-11-27 10:52:25 +00:00
Xinyu Hou 79f534273f Ran Bonjour installer in passive mode 2014-11-27 10:52:21 +00:00
Xinyu Hou dff2cb34be Download Bonjour installer according to system architecture 2014-11-27 10:52:19 +00:00
Xinyu Hou d89cb46912 Showed auto connect prompt after main window 2014-11-27 10:52:17 +00:00
Xinyu Hou 2e744b0f02 Auto start Synergy after a new client added 2014-11-27 10:52:16 +00:00
Xinyu Hou 3b1e15ba08 Try user specified name when auto detect failed 2014-11-27 10:52:14 +00:00
Xinyu Hou 97ea94de69 Solved zeroconf service name conflict 2014-11-27 10:52:12 +00:00
Xinyu Hou 5222b81600 Changed message box when no server detected 2014-11-27 10:52:10 +00:00
Xinyu Hou c560eabeb2 Fixed close null mutex and condvar 2014-11-27 10:52:08 +00:00
Xinyu Hou f022d814e6 Removed duplicated arch instance 2014-11-27 10:52:07 +00:00
Xinyu Hou 7c02369437 Stopped starting synergy when server is detected 2014-11-27 10:52:05 +00:00
Xinyu Hou 5afd94edb3 Added mutex for updating zeroconf service 2014-11-27 10:52:03 +00:00
Xinyu Hou c323003f65 Removed dead code 2014-11-27 10:52:01 +00:00
Xinyu Hou 40ef0b03c2 Made Mac buttons the same layout as Windows ones 2014-11-27 10:51:59 +00:00
Xinyu Hou e71e7e1cd3 Catched exception while getting active desktop name 2014-11-27 10:51:58 +00:00
Xinyu Hou 5833b434ef Changed message box types 2014-11-27 10:51:56 +00:00
Xinyu Hou a289c1cbe3 Showed first tab in server config dialog as default 2014-11-27 10:51:54 +00:00
Xinyu Hou 20db8d55af Modified and centered install Bonjour msgbox 2014-11-27 10:51:52 +00:00
Xinyu Hou ec4ef549bb Added ignore auto connect clients check box in dialog 2014-11-27 10:51:50 +00:00
Xinyu Hou 471e198efc Fixed race condition for updating zeroconf service 2014-11-27 10:51:49 +00:00
Xinyu Hou 56b3231a6c Made service error log more readable 2014-11-27 10:51:47 +00:00
Xinyu Hou 22475067de Fixed the warning logic when hostname is empty 2014-11-27 10:51:45 +00:00
Xinyu Hou 1a69f458b7 Shown client name in detect dialog 2014-11-27 10:51:42 +00:00
Xinyu Hou 2aec1223ae Show server list when 2 or more servers detected 2014-11-27 10:51:39 +00:00
Xinyu Hou 66a1ffa5f5 Added ignore auto connect clients check box 2014-11-27 10:51:36 +00:00
Xinyu Hou aa9990fba9 Updated server config dialog UI generated by Qt 2014-11-27 10:51:33 +00:00
Xinyu Hou b2435cdaef Resolve #4230 more user friendly dialog when client is detected 2014-11-27 10:51:29 +00:00
Xinyu Hou 30f478ad5c Fixed legacy resource filename 2014-11-27 10:51:25 +00:00
Xinyu Hou fa1092d665 Resolve zeroconf uses bogus IPs #4091 2014-11-27 10:51:22 +00:00
Xinyu Hou 8d7f6e146d Fixed startSynergy twice when detect the first server 2014-11-27 10:51:18 +00:00
Xinyu Hou f0cb271902 Resolved Auto-conf server select #4218 2014-11-27 10:51:15 +00:00
Xinyu Hou 6cb589d18e Made Bonjour install Windows only #4196 2014-11-27 10:51:12 +00:00
Xinyu Hou 6fd8afafbd Solved #4196 by download and open Bonjour installer 2014-11-27 10:51:08 +00:00
Xinyu Hou 376c983d21 Added cancel download 2014-11-27 10:51:05 +00:00
Xinyu Hou 8503833e3d Added seamless download of Bonjour 2014-11-27 10:51:01 +00:00
Xinyu Hou f781cce156 Prompt to enable auto connect #4196 2014-11-27 10:50:58 +00:00
Xinyu Hou 5bd65b5426 Added download Bonjour code 2014-11-27 10:50:54 +00:00
Xinyu Hou 330121ce55 Asked users if they want to install Bonjour 2014-11-27 10:50:51 +00:00
Xinyu Hou 5db30cff74 Fixed memory leak 2014-11-27 10:50:47 +00:00
Xinyu Hou 588494a730 Check is Bonjour running before update zeroconf 2014-11-27 10:50:44 +00:00
Xinyu Hou 6ef744cd81 Added code to check if Bonjour service is running 2014-11-27 10:50:40 +00:00
Xinyu Hou c51ce29954 Removed Bonjour dependency in wix 2014-11-27 10:50:37 +00:00
Xinyu Hou 9fd11da578 Drop C prefix on Windows 2014-11-12 11:44:29 +00:00
Xinyu Hou e5e0a3b653 Drop C prefix on Linux 2014-11-12 11:28:41 +00:00
Xinyu Hou 67377109f3 Moved Screen class into synergy namespace 2014-11-11 17:45:24 +00:00
Xinyu Hou a4843c4947 Fixed "c" prefix compile error on Mac 10.10 2014-11-11 14:58:30 +00:00
Xinyu Hou 1aaa55163c Fixed "c" prefix compile error on Windows 2014-11-11 14:50:09 +00:00
Nick Bolton 41d6080028 changed company name in copyright notice 2014-11-11 13:52:03 +00:00
Nick Bolton e8e156f0e2 dropped "c" prefix from class names 2014-11-11 13:51:47 +00:00
Xinyu Hou afa24f4a02 Disable the privilege helper tool #4191 2014-11-06 17:08:58 +00:00
Xinyu Hou 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
Xinyu Hou d347cbd45f Merge branch 'pdecat-master' 2014-11-05 10:25:31 +00:00
chris 65fc59eeae clean up changes for pull request 2014-11-04 12:17:30 -05:00
chris 93d864ad6f clean up changes for pull request 2014-11-04 12:16:58 -05:00
chris 8024aa9ab1 Working fix for #4055 (client shift key problem) in place 2014-11-04 12:06:30 -05:00
Xinyu Hou 117208754f Hided elevate checkbox on Unix #4130 2014-10-27 17:15:50 +00:00
Xinyu Hou 23670c5f9b Moved elevate checkbox to settings #4130 2014-10-27 17:10:12 +00:00
Xinyu Hou d2191b6b93 Auto elevate for Windows UAC and screen lock #4130 2014-10-27 16:39:18 +00:00
Xinyu Hou 4d3fd14ada Merge branch 'caramis-master' 2014-10-27 14:46:54 +00:00
Xinyu Hou 6756296d85 Made daemon take full responsibility for logging #4128 2014-10-27 14:11:43 +00:00
Xinyu Hou 39b534f3b8 Merge branch 'petroules-mac-fixes' 2014-10-27 13:04:59 +00:00
Xinyu Hou de68346874 Fixed hm config error 2014-10-27 11:58:25 +00:00
Xinyu Hou df29bf8e54 Merge branch 'helkanen-master' 2014-10-24 15:10:44 +01:00
Jake Petroules 5b4e46f8ea Fix Info.plist for Synergy GUI.
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07:00
Xinyu Hou 5c6eba8790 Merged argsParse to master 2014-10-23 13:21:41 +01:00
Xinyu Hou a32cb41342 Parse arg refactoring #4124
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou a71ebc78b3 Parse arg refactoring #4124
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou 943a355359 Parse arg refactoring #4124
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Xinyu Hou e26ccfdce6 Parse arg refactoring #4124
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou f9f2d8e8af Parse arg refactoring #4124
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou d2814a423c Parse arg refactoring #4124
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Xinyu Hou 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
Nick Bolton c2b3f1414b Merge branch 'master' of https://github.com/pdecat/synergy into pdecat-master 2014-10-22 12:49:16 +01:00
Jean-Philippe Andre 9e358233c3 Fix copy&paste for EFL applications
Fixes issue 4021.
2014-10-22 20:32:16 +09:00
Nick Bolton 4a24a2117a Merge branch 'master' of https://github.com/caramis/synergy into caramis-master 2014-10-22 11:59:14 +01:00
Xinyu Hou 4aa43d6995 Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit 2014-10-22 11:40:00 +01:00
Xinyu Hou a58ca97941 Merge remote-tracking branch 'origin/master' 2014-10-21 16:00:56 +01:00
Xinyu Hou 504e41966e Carbon loop not ready within 5 sec #4002
Port fix from enterprise.
2014-10-21 15:48:04 +01:00
SeokYeon Hwang 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
Jake Petroules 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
Xinyu Hou 38718a362f Enable drag and drop by default #4122
Remove premium login from GUI
2014-10-15 14:57:28 +01:00
Patrick Decat aeab72f724 Apply patch from https://github.com/synergy/synergy/issues/3749 2014-10-15 14:51:44 +02:00
jerry 7e562273d5 [no-issue]
revert to r2421
2014-09-15 15:17:07 +00:00
jerry 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 32feab2ef1 issue #65 - Auto config feature using Zeroconf/Bonjour
added warning during installation if bonjour not installed on Windows
2014-08-26 17:37:39 +00:00
jerry cdc740c5d1 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
added massage box to ask user where to add client
2014-08-26 14:49:27 +00:00
jerry aa2accf5a6 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
renamed tryFixNoServer to fixNoServer
2014-08-26 11:27:17 +00:00
jerry a2d3b5c7e2 issue #65 - Auto config feature using Zeroconf/Bonjour
gave user an option to toggle auto connect
2014-08-26 11:22:09 +00:00
jerry 828f7c02b1 issue #65 - Auto config feature using Zeroconf/Bonjour
matched argument in error handle
2014-08-26 10:25:01 +00:00
jerry 2ec6a49795 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
reverted position order back
2014-08-26 10:10:25 +00:00
jerry eb99e843c2 issue #65 - Auto config feature using Zeroconf/Bonjour
fixed start button was broken
2014-08-26 10:09:23 +00:00
jerry deb45ad393 issue #65 - Auto config feature using Zeroconf/Bonjour
change position order to left first then right
2014-08-26 09:42:24 +00:00
jerry ff5ca8b8aa issue #65 - Auto config feature using Zeroconf/Bonjour
added needed dll on windows, so no need to dependent on bonjour installation
2014-08-22 13:46:20 +00:00
jerry 8cad7551e6 issue #65 - Auto config feature using Zeroconf/Bonjour
merging zeroconf into trunk
2014-08-21 17:32:40 +00:00
jerry c4dd6eb61c sticky keys fix doesn't work, may make things worse - backed out [no-issue] 2014-08-01 10:35:16 +00:00
Nick Bolton 3a6d9e82e3 added comment about protocol version [no-issue] [no-build] 2014-07-28 08:19:29 +00:00
jerry 995730a646 issue #18 - Sticky modifier/meta keys
- improved on Mac.
2014-07-02 13:25:49 +00:00
jerry 547d99f7af issue #3404 - Log path needs to be in quotes on windows
fixed compile error
2014-06-18 13:14:12 +00:00
jerry 559237f930 issue #3404 - Log path needs to be in quotes on windows
issue solved.
2014-06-18 12:59:30 +00:00
jerry 507abdcbfb issue #4072 Carbon loop not ready within 5 sec
added lock to all condVar
2014-06-02 16:07:58 +00:00
jerry 9feaa959f1 issue #4072 - Carboon loop not ready within 5 sec
issue solved
2014-06-02 11:04:09 +00:00
jerry ae4d8cee2a issue #3307 - Configuration file paths containing spaces don't work
issue solved
2014-05-28 12:05:05 +00:00
jerry 23f762a623 issue #3404 - Log path needs to be in quotes on windows
issue solved
2014-05-28 11:59:14 +00:00
jerry 3d6413fada issue #3996 - Installer fails when Windows Firewall is disabled
issue solved
2014-05-28 10:57:28 +00:00
jerry 2d91029de4 [no-issue] [no-build] fixed indentation in gui.pro 2014-05-23 15:58:57 +00:00
jerry 1dfe867c54 issue #4060 - Key stuck down on Windows server
finished solving issue.
2014-05-23 15:01:29 +00:00
jerry f87bd9e860 - checked filename's validation before sending drag info
- refactored duplicated write to drop dir code
- removed legacy member variables
- fixed code style
- fixed typo
2014-05-14 14:45:15 +00:00
jerry 935ca0b2f2 Added support for copying images (BMP) and HTML to/from the OS X clipboard - patch by Ryan Chapman 2014-05-13 12:31:05 +00:00
Nick Bolton d9f90e319e changed synergy-foss.org to synergy-project.org 2014-05-08 07:33:35 +00:00
jerry da3b77447a fixed warning on 10.6 and 10.5 2014-05-06 19:54:02 +00:00
jerry 2797e9a719 fixed compile error and added header for runtime_error 2014-05-06 19:23:40 +00:00
jerry 9621cba99e - redesigned drag information protocol
- used DragInformation to encapsulate information and helper functions.
- renamed parameters in sendDragInfo function.
2014-05-06 18:26:47 +00:00
jerry 2666bf7cf3 copy synmacph only on mavericks. fixed warning on 10.6 2014-05-06 16:12:27 +00:00
jerry 6df7ba2fc4 try to fix gui compile error on mac 10.6 and 10.5 2014-05-06 13:00:08 +00:00
jerry b2f48a0f5b included synmacph only on mavericks or above 2014-05-06 11:57:55 +00:00
jerry cc752484e4 try to fix implicit declaration warnings below mac 10.6 2014-05-01 16:17:09 +00:00
jerry 735fd08400 fixed helper tool:
used xpc communicate between gui and mhp
made helper tool optional
gave more feedback
2014-05-01 15:54:09 +00:00
jerry ff42afc36c made drag info function name more consistent 2014-05-01 13:56:07 +00:00
jerry f773ff3d00 refactored duplicated code in dragInfoReceived
refactored fakeDraggigFiles interface
2014-04-30 18:54:32 +00:00
jerry fd68b70878 patch by Marc:
- fixed switchNeedsAlt not working
- improved logging
2014-04-30 11:17:54 +00:00
jerry 5773ed1ceb made XBase non abstract 2014-04-23 14:15:41 +00:00
jerry b876c0daf3 fixed compile error on 10.6 and 10.5 2014-04-22 16:43:04 +00:00
jerry 22ebb259d0 merged wix from ent to community (no shell extension any more) 2014-04-22 13:17:58 +00:00
jerry 5657348453 removed synwinxt 2014-04-22 11:38:09 +00:00
jerry c5e551ccae fixed name prefix in ServerApp and ClientApp.
removed testing code.
2014-04-22 10:56:30 +00:00
jerry 506cae9a63 made drag window frontmost when drag starts 2014-04-22 10:48:12 +00:00
jerry b85a9b628e used a hidden drop window to get drag filename 2014-04-22 10:33:16 +00:00
jerry 7b8cdb6b38 used really drag file extension 2014-04-17 17:25:41 +00:00
jerry de65f71312 removed left control key hack for faking drag on mac 2014-04-17 17:10:36 +00:00
jerry 8cdeafe995 fixed: compile error on mac 10.8 with makefile 2014-04-17 17:01:58 +00:00
jerry 93ebd6a9cc fixed: const type was used in queue 2014-04-17 16:49:19 +00:00
jerry 8482504b65 fixed: assigned const to non const type 2014-04-17 11:26:21 +00:00
jerry 45c1cde698 fixed: events were added before event queue was ready, caused debug build assert failure.
removed sleep hack in favour of cond var wait.
2014-04-17 10:56:25 +00:00
Nick Bolton c0f47d8eb1 fixed: missing header, fails on qt5 2014-04-09 10:19:13 +00:00
Nick Bolton 8d2de7a9cb fixed: arch headers not included on windows 2014-04-08 16:47:06 +00:00
Nick Bolton d72aa1e975 fixed: pthread linker error 2014-04-08 16:41:48 +00:00
Nick Bolton b081fc0331 fixed: code style in OSXKeyState, released ref var 2014-03-31 16:04:17 +00:00
Nick Bolton 68557afff2 fixed: modifier keys are repeated on windows server. 2014-03-31 15:54:57 +00:00
Nick Bolton 6649887ca6 reverted r2025 2014-03-31 14:57:53 +00:00
Nick Bolton 26d0f59e65 fixed: exception getWhat usage returns garbage. 2014-03-31 13:56:41 +00:00
Nick Bolton 1dc4cec703 updated gui translations master 2014-03-26 11:53:53 +00:00
jerry bc160fab01 fixed broken drag and drop in 1.4.17 2014-03-25 15:08:00 +00:00
Nick Bolton c29d3e2fd3 moved tray hide notification to before starting 2014-03-24 15:13:47 +00:00
jerry a22edc9048 reverted last checkin 2014-03-24 13:11:12 +00:00
jerry da0ea958b6 made synmacph use original code sign 2014-03-24 12:22:19 +00:00
Nick Bolton 3e5194dd4e fixed: ServiceManagement not available in 10.5 2014-03-23 12:16:11 +00:00
Nick Bolton 5ff37a0937 fixed: ServiceManagement not available in 10.5 2014-03-23 10:17:32 +00:00
Nick Bolton 1f9c2ba7e2 made ax helper mavericks only 2014-03-22 09:07:29 +00:00
jerry f59569c4a0 fixed: Bug #3927 - Mavericks accessibility exception not working (when upgrading from 1.4.15 to 1.4.16) 2014-03-21 16:08:33 +00:00
Nick Bolton 4d75150143 fixed: Bug #3968 - GUI auto-hides on initial first install (with no config) 2014-03-21 09:22:18 +00:00
Nick Bolton 0745d5884b Task #3969 - Merge String.cpp and StringUtil.cpp 2014-03-21 08:32:36 +00:00
Nick Bolton 3e84372a14 fixed: missing virtual dtor for XArch* classes 2014-03-20 13:41:23 +00:00
Nick Bolton e34e39a41c fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines) 2014-03-20 13:34:21 +00:00
Nick Bolton f9fe1130ac Task #3964 - Make premium login error more verbose 2014-03-20 10:33:33 +00:00
Nick Bolton 44a98c6c9d fixed: XArchEval "what" returns garbage (memory deleted). 2014-03-20 10:32:40 +00:00
Nick Bolton 564b5c6e51 annotated hex values in logging 2014-03-17 19:27:29 +00:00
Nick Bolton 0563eeb467 extra logging, polling keys after modifier key fake 2014-03-17 19:02:13 +00:00
Nick Bolton 729bbeab01 cleaned up osx keystate code that handles modifiers (really weird code). 2014-03-17 18:39:27 +00:00
Nick Bolton 826cd7e60b reintroduced AXIsProcessTrusted call, shouldn't break ax stuff 2014-03-17 17:25:18 +00:00
Nick Bolton 41c1319134 removed unused test 2014-03-17 16:37:17 +00:00
Nick Bolton 3ddb7ef9e3 Task #3961 - Remove Windows 95 support 2014-03-17 16:30:27 +00:00
Nick Bolton 1b5cdecc60 Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders
- reordered include order for winsock2.h (more robust)
- removed Windows.h include from synwinxt.h (not needed)
2014-03-17 14:34:13 +00:00
Nick Bolton 407378fbc5 Task #3951 - Clear filename stored in synwinxt on mouse up
- renamed some functions for file drag/drop to be more similar to existing
- improved log messages for the library loader
- removed hack that blocked .exe and .lnk files (annoying for developers)
- removed hack that always clears dragging filename (not very robust)
2014-03-17 13:10:29 +00:00
Nick Bolton ae327055c2 Bug #3959 - Premium title doesn't always show on first login 2014-03-17 12:03:43 +00:00
Nick Bolton 498f9b1e69 Task #3952 - Make Premium wizard page cleaner 2014-03-17 11:57:13 +00:00
Nick Bolton f62cac6a0a code style - indentation 2014-03-17 11:16:52 +00:00
Nick Bolton a97fa1428b Task #3954 - Make "lock to screen" log message go to NOTE level instead of DEBUG 2014-03-17 11:14:56 +00:00
Nick Bolton 28a6b16875 fixed: Bug #3933 - Plus signs in the email address cause premium login to fail 2014-03-14 20:34:19 +00:00
Nick Bolton d5b25069be fixed: extending std::runtime_error instead, as std::exception ctor is undefined. also fixed some mac warnings from inheriting runtime_error. 2014-03-14 20:33:18 +00:00
Nick Bolton ab529fae41 combined windows and unix arch internet test, there can be only one! 2014-03-14 18:32:34 +00:00
Nick Bolton bdb2ff5967 fixed: warning, size_t to UInt32 cast. 2014-03-14 18:31:06 +00:00
Nick Bolton abe108195d Task #3953 - Inherit XArch and XBase from std::exception 2014-03-14 18:30:21 +00:00
Nick Bolton 78f30db6e9 fixed: Bug #3886 - Alias is allowed to match screen name 2014-03-14 16:34:23 +00:00
jerry 77eae25279 fixed code style in Log.cpp 2014-03-14 16:04:21 +00:00
jerry 54b14c439d removed unused variables 2014-03-14 16:03:15 +00:00
Nick Bolton 053806ce5b fixed: Bug #2836 - Unable to begin screen name or alias with numbers 2014-03-14 13:52:21 +00:00
Nick Bolton 29b48e98e3 shortened msi explorer restart message, easier to read. 2014-03-12 09:00:04 +00:00
Nick Bolton 3f28be1933 fixed: shellex isn't loaded on install, restart needed. 2014-03-11 19:24:51 +00:00
Nick Bolton a788d4df18 removed redundant explorer restart (doesn't work when restart manager is disabled). 2014-03-11 12:26:02 +00:00
Nick Bolton 158a621218 fixed: msi 32-bit and 64-bit should not be installed side by side, user should use the right arch.
fixed: msi duplicate installs when using different nightly build revs (probably a hacky fix).
2014-03-10 20:21:14 +00:00
Nick Bolton 1774a3a4ee fixed: msi attempts to kill everything using synwinhk.dll (we should let the service handle this problem).
fixed: msi missing dependencies, ms crt (vc redist) and qt libraries.
2014-03-10 19:31:14 +00:00
Nick Bolton f7445a6aea changed installer from nsis to wix - attempting to fix "synwinxt.dll in use" error on upgrade. 2014-03-07 19:41:08 +00:00
Nick Bolton 64248beb4e refactored logging for synwinxt, and added version number. 2014-03-07 19:37:52 +00:00
Nick Bolton ad1cdd150a temporarily diabled pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect - causing sigsegv 2014-02-28 16:30:20 +00:00
Nick Bolton 9b9a489efc fixed: tests not compiling on linux 2014-02-28 15:36:51 +00:00
Nick Bolton f4bb72ce52 fixed:
- (weird) linker error on windows caused by using different include.
- IpcTests using private field which had a public accessor.
- some includes using wrong lib.
2014-02-28 15:04:49 +00:00
Nick Bolton ad8905ccbf fixed: silenced gtest warning on osx106 2014-02-28 13:56:07 +00:00
Nick Bolton 19bcb9dfae fixed: osx compile errors from last commit 2014-02-28 13:06:25 +00:00
Nick Bolton f3d542b2c3 fixed: linux compile errors from last checkin 2014-02-28 12:55:14 +00:00
Nick Bolton 4675f29a4c code style fixes:
- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.
2014-02-28 12:36:45 +00:00
Nick Bolton 96d97ed467 updated copyright dates. 2014-02-28 07:59:33 +00:00
Nick Bolton 8e74710dad code style: dropped C prefix 2014-02-27 17:45:17 +00:00
Nick Bolton f11c660efb used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs. 2014-02-26 17:46:02 +00:00
Nick Bolton 50a4f310c9 moved tools to ext - makes more sense, as it contains external libs, not tools 2014-02-26 16:52:54 +00:00
Nick Bolton 8d6a44d1b7 fixed: osx106 warnings 2014-02-26 15:53:28 +00:00
Nick Bolton 228befdc2c fixed: code was not gnuc 4.2 compatible 2014-02-25 19:10:54 +00:00
Nick Bolton a5d702c8b5 fixed: pragma usage not cross platform 2014-02-25 18:16:03 +00:00
Nick Bolton 78ecdf4c6e fixed: win32 warnings. 2014-02-25 15:50:06 +00:00
Nick Bolton c44971b43d fixed: warnings on mac os x 2014-02-25 15:03:43 +00:00
Nick Bolton bdb4c47898 crypto++, gtest and gmock: ignore external lib warnings, not much we can do about them 2014-02-24 16:32:18 +00:00
Nick Bolton 77676d558e potential fix for unit/integ test false positives 2014-02-24 13:45:43 +00:00
Nick Bolton ad35ccb2dc disabled all COSXKeyStateTests for osx10.6 2014-02-24 13:04:16 +00:00
Nick Bolton 2c2b136a36 disabled fakeAndPoll_shift for osx10.6 2014-02-24 12:13:51 +00:00
Nick Bolton 75d2c5abf1 fixed: nothing happens on osx 10.6 2014-02-17 19:38:26 +00:00
Nick Bolton bf361d153b support for qt 5.2 2014-02-14 16:21:02 +00:00
Nick Bolton cfc1aa2569 fixed: file is dragged twice by accident.
fixed: exe and lnk files dragged by accident.
fixed: "dir" used instead of "filename".
2014-02-07 18:44:45 +00:00
Nick Bolton 98f8a12425 fixed: watchdog keeps showing backoff message even if no command to run. 2014-02-07 18:04:25 +00:00
Nick Bolton af51454e98 fixed: garbage drop target on windows when elevated. 2014-02-07 18:03:56 +00:00
Nick Bolton d03b398bc1 - improved string conversion by using ms comutil.
- removed dead member variable.
- extra logging to help debug file drop on windows.
2014-02-07 17:06:26 +00:00
Nick Bolton fe40c670a4 fixed: "set" should be used instead of "update" 2014-02-07 15:55:59 +00:00
Nick Bolton 3ee4f55a61 "dir" was used by mistake instead of "filename" 2014-02-07 15:54:01 +00:00
Nick Bolton 8a8ae6c0b1 fixed: use of inc var is confusing. 2014-02-07 15:36:07 +00:00
Nick Bolton 39a2ecbd8f fixed: drag and drop error on mavericks - never create your own instance of NSApplication\! 2014-02-07 14:53:17 +00:00
Nick Bolton 88a84b6f04 fixed: drag and drop crashes windows - reintroduced empty function to stop not impl exception. 2014-02-07 14:23:17 +00:00
Nick Bolton 2d0d0010d7 fixed: integ tests - drag drop was disabled. 2014-02-07 12:33:26 +00:00
Nick Bolton deff54f051 fixed: accidentally nerfed drag and drop. 2014-02-07 11:30:48 +00:00
Nick Bolton f149101d25 fixed: linux client crashes on file drop, even though drag and drop is disabled 2014-02-06 18:39:12 +00:00
Nick Bolton 9c3e9aab09 removed not impl exception, not very helpful and causes crash on linux (gets called even though drag/drop not enabled). 2014-02-06 16:08:33 +00:00
Nick Bolton 3aec1b01ca fixed: linux curl link error 2014-02-05 17:49:43 +00:00
Nick Bolton ee87828a9d fixed: code style (qt pro file) 2014-02-05 16:42:45 +00:00
Nick Bolton 59cd5ac554 fixed: code style (win) 2014-02-05 16:38:23 +00:00
Nick Bolton aae76f612a fixed: code style 2014-02-05 16:38:03 +00:00
Nick Bolton 456e56d5dc - fixed: windows http get exceptions stop cleanup.
- made premium auth errors more tidy.
2014-02-05 16:28:29 +00:00
Nick Bolton 5ca1c17549 native unix http get for premium auth 2014-02-05 14:29:50 +00:00
Nick Bolton 3f18c7c63f fixed: CArch.h missing from vs project. 2014-02-05 12:47:26 +00:00
Nick Bolton dfe6c3889e fixed: last patch went awry 2014-02-04 19:46:45 +00:00
Nick Bolton 7f08036ff3 native windows http get for premium auth 2014-02-04 19:41:29 +00:00
Nick Bolton b0a02fc94b fixed: ignore --enable-drag-drop includes os major 6 (vista family) 2014-01-28 17:21:49 +00:00
Nick Bolton 443e0cbc72 ignore --enable-drag-drop below vista and on linux 2014-01-28 16:50:40 +00:00
Nick Bolton a573a44842 make sure synwinxt.dll can only be loaded on vista and above 2014-01-28 16:44:01 +00:00
Nick Bolton fd9abce229 added applications shortcut to dmg, prevented synergy from opening in /Volumes/, attempted fix for os x 10.8 would show assistive devices warning even if enabled. 2014-01-28 11:33:54 +00:00
Nick Bolton f050f04014 only hide when connected (desktop mode) 2014-01-27 16:58:22 +00:00
Nick Bolton d0abad9123 auto start and auto hide by default 2014-01-27 16:50:41 +00:00
Nick Bolton 3d963bfbe7 possible fix for mavericks 2014-01-24 17:53:03 +00:00
jerry a610012fb4 patch by Jack Zhou and Henry Tung to fix alt tab not working on windows 8 (Issue# 3338). 2013-10-30 13:49:40 +00:00
Nick Bolton 8a5bf073be fixed: Option not supported on Linux: --enable-drag-drop 2013-10-22 18:10:14 +00:00
Nick Bolton 469a263356 fixed: error when installing, The parameter is incorrect. 2013-10-22 18:07:28 +00:00
Nick Bolton 786ddba1c9 fixed: bad #if usage 2013-10-16 17:20:32 +00:00
Nick Bolton 8c99a5f60d fixed: quoted string doesn't work on mac 2013-10-16 16:52:30 +00:00
Nick Bolton 64c7a01ebb fixed: synergys crashes on exit. 2013-10-16 15:38:36 +00:00
Nick Bolton 2520bf4773 fixed: gui "start" button visible even though server/client is running. 2013-10-16 15:30:42 +00:00
Nick Bolton 658a3e3e8f - made windows gui service only (removed desktop mode).
- changed watchdog to only launch if it has a command.
2013-10-15 15:46:02 +00:00
Nick Bolton 8040f1c5a3 changed m_relauncher to m_watchdog 2013-10-15 10:04:27 +00:00
Nick Bolton d09ee887d8 renamed CMSWindowsRelauncher to CMSWindowsWatchdog 2013-10-14 17:15:03 +00:00
Nick Bolton 499cd47e63 - fixed: process should shut down when command is empty.
- fixed: when command was empty quotes ("") daemon crashed.
2013-10-14 17:10:51 +00:00
Nick Bolton 79ab428454 refactored windows service "relauncher" (process watchdog), so that it's easier to understand. 2013-10-14 16:29:02 +00:00
jerry b9016bc1ae - encapsulated Windows session
- fixed code style
2013-10-10 16:06:13 +00:00
Nick Bolton 85eae2a744 fixed: exploit, \Program.exe is launched instead of synergy binaries. 2013-10-03 14:24:58 +00:00
jerry 10b9b2e406 added null point handling for get dragging file directory. 2013-09-26 11:34:21 +00:00
jerry 952be51c8c fixed sending file twice when drag a file from Mac server to Windows client 2013-09-25 15:57:10 +00:00
jerry 6e50945bf9 created a new thread to write file to drop directory on client side 2013-09-25 14:49:04 +00:00
jerry 8301d50ab7 fixed drop target dir out of date 2013-09-25 13:11:19 +00:00
jerry 6c6b40e644 removed logging info that is used only for debug. 2013-09-25 12:45:10 +00:00
jerry fd0f5e1db2 disabled drag and drop feature if there is no --enable-drag-drop cmd arg 2013-09-25 12:37:27 +00:00
jerry e24afa5670 removed some unused include file dependencies and logging info only for debug 2013-09-25 10:50:11 +00:00
jerry 95ece5ac2c fixed Mac server keeps crashing during launch 2013-09-25 10:44:09 +00:00
jerry 4816a30db3 Feature to drag a file from Windows (client) to Mac (server):
- changed the size of the window for dragging on Mac to 3 by 3 pixels.
- on server side, use a new thread to write file to the drop directory.
2013-09-24 16:29:51 +00:00
jerry e145fef76f moved fake esc and lmb between getDropFileURL and draggingInfoSending, otherwise it would make getDropFileURl return null or fail to fake lmb up on carbon hardware layer, then can not move mouse back from client 2013-09-24 10:33:29 +00:00
jerry 57db3da6f3 faked escape key down and up then a left mouse button up in CServer when isSwitchOkay return true.
removed the assertions in CScreen so server screen can fake input event as well.
2013-09-23 15:31:34 +00:00
jerry f6ecf9322c hacked isLockedToScreen so that mouse move back from windows client to mac server after dropping a file 2013-09-18 14:32:38 +00:00
jerry 4e09b06cb0 fixed drag drop from Mac server to Windows client 2013-09-18 14:12:19 +00:00
jerry 39734374b1 renamed newCursor to newPos 2013-09-18 09:21:22 +00:00
Nick Bolton 0d65ff9a4c removed thread delete; threads are deleted automatically 2013-09-18 08:35:00 +00:00
Nick Bolton 2935c6671e added --enable-drag-drop arg and supporting gui changes. 2013-09-18 08:34:32 +00:00
Nick Bolton ba78e4b67f disabled CIpcTests and NetworkTests on mac, which are failing intermittently. 2013-09-18 06:52:18 +00:00
jerry 7455ce70e0 supported dragging a file from different sides of server (up, down, right and left) to a Mac client 2013-09-17 19:22:21 +00:00
Nick Bolton 37140f9e93 newlines for outputDebugStringF usage. 2013-09-17 18:47:40 +00:00
jerry 340e31298e - removed --filetransfer-src and --filetransfer-des args.
- on Window, temporarily use user desktop directory as drop target.
2013-09-17 18:13:58 +00:00
Nick Bolton 760e38eeba added some hacky sleeps to temporarily fix some thread timing issues (causing access violations). the best fix would be to use wait cond vars, but first we need to really understand the bug. 2013-09-16 15:21:36 +00:00
jerry 6f982a501a fixed dragged name out of date. 2013-09-13 15:44:33 +00:00
jerry e9f43fa7c5 - using cocoa code to fake mouse button down instead of using synergy code.
- fake a ctrl key up and esc key down and up before leave the screen if there is a dragging operation.
2013-09-12 17:42:50 +00:00
jerry dbc7659776 changed the transparency of the window where drag is from on mac. 2013-09-12 11:43:34 +00:00
Nick Bolton b92b7c71fb fixed donate urls in gui. 2013-08-31 17:18:28 +00:00
Nick Bolton 501e894d03 - modified windows installer to register new shell ext dll for drag/drop.
- stopped release shell ext dll from crashing by initializing ref counting members.
- added logging to shell ext dll to debug crash.
2013-08-31 17:05:17 +00:00
Nick Bolton bf0204e7c2 ifdef'd out the COSXDragView implementation on osx < 10.7 2013-08-30 21:36:04 +00:00
jerry fbfea7b543 fixed previous commit - the 10.6 compile error was coming from COSXDragView.h, not COSXDragSimulator.m 2013-08-30 21:17:09 +00:00
jerry 6e57005b4a limited drag file feature only for mac 10.7 or above 2013-08-30 20:18:13 +00:00
jerry 9d62232a72 fixed parentheses mess 2013-08-30 20:08:20 +00:00
jerry 43e2535335 Feature to drag a file from Mac (client) to Windows (server):
- temporarily drop dragging file to desktop (specified by command line arg --filetransfer-des)
- on Mac side, fake an esc key while dragging off the screen does not seem to work
2013-08-30 19:49:38 +00:00
Nick Bolton af04f8b2ef reverted failure test for buildbot. 2013-08-30 18:51:01 +00:00
Nick Bolton 46a33b2d97 fixed: return value from last commit - should be 1, not 0. 2013-08-30 18:39:10 +00:00
Nick Bolton fcf5940c67 fixed: missing return value from last commit. 2013-08-30 17:53:34 +00:00
Nick Bolton 7b217abe21 temp fail for unit tests to test buildbot failure email 2013-08-30 17:35:37 +00:00
Nick Bolton d68e472d2f changed sleep hack from 1sec to .2sec to speed up integ tests on build machine (todo: get rid of this hack) 2013-08-30 17:33:35 +00:00
Nick Bolton 93b593f13e hacked osx integ key tests to stop COSXKeyStateTests.fakeAndPoll_charKeyAndModifier from failing 2013-08-30 17:05:52 +00:00
Nick Bolton 024f66e25e fixed unit tests, changed modes to cfb (other modes have been removed). 2013-08-30 15:20:36 +00:00
jerry ce1b62db14 Feature to drag a file from Windows to Mac:
- On Mac client main thread is used for cocoa application in order to simulate drag.
- Send dragging file dir from Windows server to Mac client while dragging after switching screen.
- Dragging information sending is immature now (need to support multi files dragging in the future).
- Used Cocoa function to monitor dragg pasteboard.
- Changed Mac client to use another thread for event queue instead of the main thread.
- Change fileRecieveComplete to fileRecieveCompleted.
2013-08-30 14:38:43 +00:00
jerry 031a84ca84 - Allow dragging one file from Windows (server) to Mac (client), --filetransfer-des needs to be specified in client side's command line. 2013-08-23 15:36:23 +00:00
jerry 012fe6ddd8 - Log out dragging file's directory in Synergy (using COM shell extension)
- Change shell extension dll Main.cpp to synwinxt.cpp
2013-08-23 09:59:31 +00:00
jerry 587c320f61 - Added data handler shell extension project (synwinxt) which will output a dll file.
- Removed misused comments in CServerProxy
2013-08-21 13:30:46 +00:00
jerry a25587c4c5 - Removed GCM, CTR and OFB encryption modes.
- Every time server sends CALV message, IV will be changed as well.
2013-08-16 18:06:30 +00:00
Nick Bolton beab22e5b2 gui: made username and password hashed, and disabled unreliable ssl library usage (getting ssl context errors). 2013-08-12 12:01:23 +00:00
jerry 63487e565d hacked network integ tests, so they only run once on mac. so that nightly build passes (connection failed after about 7 test repeats) 2013-08-06 16:21:22 +00:00
Nick Bolton 17410d5706 patch by Yutaka Tsutano - fixes: Bug #3287 - Mac does not wake up 2013-08-02 16:48:09 +00:00
jerry dab838ed14 - renamed synrgyhk.dll to synwinhk.dll and moved lib code to separate folder.
- removed game device support (fallen into significant disrepair).
2013-08-02 13:21:06 +00:00
Nick Bolton 289f1ff71f Patch by Jerry:
- Added fixed pause between raising each file transfer event
- Removed redundant member variables in CClient and CServer
2013-07-26 14:10:06 +00:00
Nick Bolton 811cfd146d Patch by Jerry:
- Measure file transfer speed
- Increased quit timeout in NetworkTests
- Some code duplication, to be fixed in future patch
2013-07-26 12:44:14 +00:00
Nick Bolton 99a7e0db23 Patch by Jerry:
- Added include path for std::runtime_error
2013-07-26 10:26:20 +00:00
Nick Bolton 0f83676c60 Patch by Jerry:
- Fixed include path
2013-07-24 20:16:35 +00:00
Nick Bolton 394ece004a Patch by Jerry:
- Fixed line endings
- Integ test for file transfer
- Fixed crashed problem when log info is larger than 2048 bytes
- Fixed compile error caused by std exception (by Feng ye)
- Fixed include path on Mac and linux (by Feng ye)
2013-07-24 16:41:12 +00:00
Nick Bolton c368013f13 Patch by Jerry for issue 46:
- Unit test for sending file data from server to client.
- Removed singleton pattern from CSocketMultiplexer for easier unit testing.
- Incremented protocol version from 1.4 to 1.5 (new file chunk message).
- Storing pointer to CConfig instead of copying in CServer (so we can mock it).
- Created a common event queue for testing (timeout, quit event, etc).
- Fixed code style.
2013-07-16 19:02:30 +00:00
Nick Bolton 6f97f1d186 gui: premium reminder feature 2013-07-05 12:05:08 +00:00
Nick Bolton 6919b68947 patch by Feng Ye - initialize m_typesForCClient 2013-07-01 12:25:04 +00:00
Nick Bolton 18a3db6843 patch by jerry: fixed new event queue on Mac and Linu 2013-06-29 22:02:04 +00:00
Nick Bolton 608074c041 - made unit testing easier by (mostly) removing the event queue singleton.
- fixed code style in many places (mostly indentation).
2013-06-29 14:17:49 +00:00
Nick Bolton 13b2649fa0 added ?source url arg to gui links. 2013-06-05 15:41:14 +00:00
Nick Bolton 2182906451 jerry's patch: fixed version checker label was being hidden by status label, and was using old update check url. 2013-06-05 14:47:42 +00:00
Nick Bolton a986125965 added error message to premium wizard page login. 2013-06-05 11:46:05 +00:00
Nick Bolton 104051adc4 added user agent header to json auth post. 2013-06-04 22:43:16 +00:00
Nick Bolton 0d4cf81c60 fixed: qt adding damn html to the labels again (argh!)
fixed: radio buttons too close together on premium page.
2013-06-04 19:41:27 +00:00
Nick Bolton c9f0360081 added premium login page. 2013-06-04 17:37:27 +00:00
Nick Bolton 9f25a1efcd stripped out remaining vnc stuff 2013-05-31 16:06:51 +00:00
Nick Bolton 2be3ad7763 gui: updated translations 2013-05-31 16:01:34 +00:00
Nick Bolton 1b969a4283 removed dead vnc integration attempt. 2013-05-31 15:43:37 +00:00
Nick Bolton 7ab09dffd9 jerry's patch: Fixed: language drop down combo box was centered on Mac and rearrange the settings dialog. 2013-05-31 15:13:41 +00:00
Nick Bolton de9cffabac jerry's patch: Fixed: changing language will reset process mode and logging level in the setting dialog. 2013-05-31 14:58:36 +00:00
Nick Bolton f4f7f69b3f moved new crypto stuff into io library, since it inherits CStreamFilter 2013-05-30 13:48:08 +00:00
Nick Bolton e05a9dfa98 jerry's patch for issue 3062 (add gui translations) 2013-05-29 20:46:24 +00:00