aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and nxage...Mike Gabriel2017-12-058-88/+18
* Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.xMike Gabriel2017-12-059-90/+84
|\
| * nxcomp: use lowercase abbreviations for seconds and millisecondsUlrich Sibiller2017-12-029-71/+71
| * nxcomp: remove unused return valuesUlrich Sibiller2017-12-021-19/+12
| * nxcomp: Fix setting of global tcpFDUlrich Sibiller2017-12-021-1/+2
|/
* Merge branch 'uli42-pr/nokeyconv' into 3.6.xMihai Moldovan2017-11-265-5/+72
|\
| * Keyboard.c: make nxagentKeycodeConversion a BooleanUlrich Sibiller2017-11-231-1/+1
| * add option keyconv=(auto|on|off)Ulrich Sibiller2017-11-235-0/+67
| * Keyboard.c: Use booleans for nxagentKeycodeConversionUlrich Sibiller2017-11-231-5/+5
|/
* nxcomp/src/Misc.cpp: Update explanation for the NX_TEMP env variable.Mike Gabriel2017-11-221-2/+1
* nxproxy.1 man page: Update explanation for NX_TEMP env variable.Mike Gabriel2017-11-221-2/+1
* Merge branch 'Ionic-bugfix/hardcode-socket-paths-in-libX11' into 3.6.xMike Gabriel2017-11-221-168/+0
|\
| * nx-X11/lib/include/xtrans/Xtranssock.c: drop UNIX path overrides as well.Mihai Moldovan2017-11-221-168/+0
|/
* Merge branch 'uli42-pr/simplify_free' into 3.6.xMike Gabriel2017-11-2113-185/+58
|\
| * Error.c: simply nxagentGetClientsPath()Ulrich Sibiller2017-11-211-31/+8
| * simply free() callsUlrich Sibiller2017-11-2112-154/+50
|/
* Merge branch 'uli42-pr/options_on_reconnect' into 3.6.xMike Gabriel2017-11-203-57/+60
|\
| * Args.c: simplify nxagentProcessOptionsFile()Ulrich Sibiller2017-11-181-20/+16
| * Args.c: Fix compile bug with DEBUG enabledUlrich Sibiller2017-11-181-1/+1
| * Fix options parsing on reconnectUlrich Sibiller2017-11-183-36/+43
|/
* Merge branch 'uli42-small_fixes' into 3.6.xMike Gabriel2017-11-174-135/+23
|\
| * fix broken path due to missing /Ulrich Sibiller2017-11-171-10/+10
| * NXglxext.c: rename and relocate variableUlrich Sibiller2017-11-171-4/+3
| * glxext.c/NXglxext.c: merge two functions into oneUlrich Sibiller2017-11-172-120/+9
| * keysym.h: fix include pathUlrich Sibiller2017-11-171-1/+1
|/
* Merge branch 'uli42-pr/fix_manpage' into 3.6.xMike Gabriel2017-11-171-55/+73
|\
| * nxagent manpage: some minor formatting improvements and typo fixesUlrich Sibiller2017-11-171-55/+73
|/
* Merge branch 'Ionic-bugfix/hardcode-some-socket-paths' into 3.6.xMike Gabriel2017-11-041-15/+7
|\
| * nxcomp/src/Loop.cpp: hardcode X11 and (legacy/xfs) font UNIX paths.Mihai Moldovan2017-11-041-15/+7
|/
* Merge branch 'Ionic-bugfix/fix-X-cookie-on-osx' into 3.6.xMike Gabriel2017-11-031-3/+23
|\
| * nxcomp/src/Auth.cpp: handle launchd sockets in DISPLAY variable correctly whe...Mihai Moldovan2017-11-031-3/+23
|/
* nxproxy: use ax_pthread.m4.Mihai Moldovan2017-10-273-0/+18
* nxcomp/m4/ax_pthread.m4: move to top-level m4/ directory, use symlink.Mihai Moldovan2017-10-272-485/+486
* Regression fix for f855b3b6. Caused FTBFS with Loop.cpp:2669:0: error: unterm...Mike Gabriel2017-10-271-1/+0
* Merge branch 'theqvd-improved-logging-loop' into 3.6.xMike Gabriel2017-10-271-2869/+1603
|\
| * nxcomp/src/Loop.cpp: fix whitespace errors on continued lines.Mihai Moldovan2017-10-271-810/+810
| * Remove leading \n in NXTrans* loggingVadim Troshchinskiy2017-10-271-3/+3
| * Fix whitespace and line splitting issues reported by ionicVadim Troshchinskiy2017-10-271-10/+19
| * Conversion of Loop.cpp to the new log systemVadim Troshchinskiy2017-10-271-2560/+1285
* | Merge branch 'theqvd-improved-logging' into 3.6.xMike Gabriel2017-10-2721-2/+2693
|\|
| * nxcomp: add basic logging_test utility in test subdirectory.Mihai Moldovan2017-10-276-1/+373
| * nxcomp/src/Log.h: prepare for logger testing application.Mihai Moldovan2017-10-271-0/+4
| * nxcomp/src/Log.cpp: add PID to thread ID output if requested.Mihai Moldovan2017-10-271-1/+2
| * nxcomp/src/Log.h: block signals while writing out data.Mihai Moldovan2017-10-271-0/+20
| * nxcomp/src/Log.{cpp,h}: port to std::stack as internal buffer structure.Mihai Moldovan2017-10-272-23/+37
| * nxcomp/{configure.ac,Log.cpp}: implement configure-time std::put_time check a...Mihai Moldovan2017-10-272-1/+19
| * nxcomp/Log.h: delete stream_ member before class object destruction.Mihai Moldovan2017-10-271-0/+4
| * nxcomp/Log.h: also clear the buffer after setting it to an empty string.Mihai Moldovan2017-10-271-1/+2
| * Set default log level to WARNINGVadim Troshchinskiy2017-10-271-1/+1
| * New logging implementationVadim Troshchinskiy2017-10-274-0/+719