This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch build-main in repository x2goclient. omits 5b8b16a release 4.1.0.1 omits 46c2dbd src/sessionbutton.cpp: only append "XDM@" string to server text if a direct XDMCP session was requested. omits 0445179 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new --branding option that replaces the seal logo. Fixes: #1162. omits a273082 src/help.cpp: add documentation for the --background option. Part of #1162. omits 22d5ae2 Disable sound button on direct RDP and XDMCP sessions. Set for direct XDMCP session autologin=true. Set for direct XDMCP session username=XDM. omits 8dff29b src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section. omits 77b0859 - Add "direct XDMCP" functionality. adds 9612e6a src/sshmasterconnection.cpp: use ssh_channel_listen_forward () instead of ssh_forward_listen () for newer libssh versions. Fixes: #870. adds 15ce4da src/sshmasterconnection.cpp: with libssh 0.6.0 and newer, get the public key via ssh_get_server_publickey () (0.8.0 and higher) or ssh_get_publickey () (0.7.x and lower) and its hash via ssh_get_publickey_hash () instead of using the deprecated ssh_get_pubkey_hash () function. adds c6ce255 src/sshmasterconnection.cpp: replace string_free () with its successor ssh_string_free (). adds d616e09 src/sshmasterconnection.cpp: replace deprecated channel_new () function with ssh_channel_new (). adds dffc470 src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward (). adds 3b037cd src/sshmasterconnection.cpp: replace deprecated channel_open_session () function with ssh_channel_open_session (). adds b722370 src/sshmasterconnection.cpp: replace deprecated channel_request_exec () function with ssh_channel_request_exec (). adds f1abcbd src/sshmasterconnection.cpp: replace deprecated channel_poll () function with ssh_channel_poll (). adds e67bf45 src/sshmasterconnection.cpp: replace deprecated channel_read () function with ssh_channel_read (). adds f86895a src/sshmasterconnection.cpp: replace deprecated channel_is_eof () function with ssh_channel_is_eof (). adds d14a335 src/sshmasterconnection.cpp: replace deprecated channel_write () function with ssh_channel_write (). adds a71ce02 src/sshmasterconnection.cpp: replace deprecated channel_send_eof () function with ssh_channel_send_eof (). adds efd41a9 src/sshmasterconnection.cpp: replace deprecated channel_close () function with ssh_channel_close (). adds 1d8a37a src/sshmasterconnection.cpp: replace deprecated channel_free () function with ssh_channel_free (). adds ed981d1 src/sshmasterconnection.cpp: use QString::arg () to insert function name and thus deduplicate error translation messages. adds bb727e5 src/sshmasterconnection.cpp: fix up some debug strings. adds a5b4d79 src/sshmasterconnection.cpp: port more occurrences of "QString to C string" akin to 1b21d75f2c10609f3586f5b5e0b4ceb7fca83fdd. adds a5639de src/sshmasterconnection.cpp: enable parsing of ~/.ssh/config. Fixes: #1121. adds 8e503d8 src/{onmainwindow,httpbrokerclient}.cpp: fix up error/warning message displayed when the server-specified key is unknown, but we have another key type stored already. adds e7e2e4e src/pulsemanager.cpp: fix up a debug string. adds 43da15a src/sshmasterconnection.cpp: libssh < 0.6.0 does not have the ssh_options_get () API, but instead expects users to pull out information directly from the ssh_session structure. adds 9e96ba4 src/sshmasterconnection.cpp: turns out libssh < 0.6.0 doesn't support fetching the host, port and username parameters at all. adds 45d0f1b src/x2goutils.cpp: ensure that add_to_path () also processes the first value passed. adds f34d0d3 - Add "direct XDMCP" functionality. adds 77cac93 src/onmainwindow.cpp: unbreak Windows and OS X builds - directRDP is only available on Linux, so guard new section. adds 483f036 res/i18n/x2goclient_et.ts: update Estonian translation file. adds 36231da res/i18n/x2goclient_et.ts: various fixups for the Estonian translation file. adds f26edb0 res/i18n/x2goclient_*.ts: go the extra mile and fix up translation files manually after the "anothertype" fix in 8e503d89ee2d03a313c3deff11f0516fce503022. adds 24a5bc4 {src/{onmainwindow,httpbrokerclient}.cpp,res/i18n/x2goclient_*.ts}: fix another occurrence of a string missing a space separator between words and update translation files. adds 4d543b0 src/onmainwindow.cpp: don't duplicate depth warning message needlessly, use correct plural forms in translations and split string up in a translation-friendly form. adds 85056d9 {src/printdialog.cpp,res/i18n/x2goclient_*.ts}: drop spurious left-over parenthesis in warning message and adapt translations. adds 4525afe src/onmainwindow.cpp: make the "not loading translator" message non-translatable, as it doesn't make a lot of sense to actually translate it. adds b116007 {src/{configdialog,x2goutils}.cpp,res/i18n/x2goclient_*.ts}: change XQuartz project homepage references, adapt translations. adds 610e9b2 src/pulsemanager.{cpp,h}: make get_* () functions const. adds 7ce4e35 src/pulsemanager.{cpp,h}: make is_server_running () const. adds 3030702 src/pulsemanager.{cpp,h}: add new pulse_version_valid_ boolean class member variable, set it correctly and use it whenever the version is accessed. adds 6606f4b src/pulsemanager.cpp: make fetch_pulseaudio_version () more resilient. adds 54efae5 src/pulsemanager.{cpp,h}: add show_startup_warning () for both PA server and (debug) startup sound playback. adds 9609888 src/pulsemanager.cpp: check server_binary_ before using it and jump over code that assumes the PA server binary to be available. adds 3fc1b2f src/pulsemanager.cpp: don't fail hard on OS X if the PA server binary could not be found in the constructor. adds a0ae3bc src/pulsemanager.cpp: deduplicate warning/error messages - make use of show_startup_warning (). adds cdad7f8 res/i18n/x2goclient_*.ts: regenerate translation files and fix up some SSH and PulseManager messages manually, where possible. adds 6792724 src/x2ogutils.h: guard UNUSED macro definition. adds 6ff714b {macbuild.sh,src/{x2goutils.h,{pulsemanager,onmainwindow}.cpp},x2goclient.pro}: make MacPorts prefix selectable at compile time. adds 8529206 Disable sound button on direct RDP and XDMCP sessions. Set for direct XDMCP session autologin=true. Set for direct XDMCP session username=XDM. adds b207323 res/i18n/x2goclient_fi.ts: update Finnish translation file. adds 16ab92c res/i18n/x2goclient_fi.ts: remove outdated comment. adds 39d35fe debian/changelog: add closure for #1093, was actually legit. adds 51a0b54 src/sshprocess.cpp: bind direct tunnel socket to localhost instead of any address. Fixes: #31. adds 32e36a2 src/onmainwindow.cpp: check for sessionExplorer->getLastSession() to be valid in all places but obvious ones. Fixes: #499. adds d46c15e src/sshmasterconnection.cpp: use new PKI-based libssh API for public key authentication for libssh 0.6.0 and higher. Fixes: #1119. adds b7678eb src/sshmasterconnection.cpp: add YubiKey challenge auth prompt. adds 4d7104d Also commit the actual data... adds 2e90d7b src/sshmasterconnection.cpp: fix compile errors on pre-libssh-0.6.0 systems and add a TOCTU-race check to see if the file exists prior to calling privatekey_from_file () on such systems. adds 1f8495c macbuild.sh: fix long-standing issue that made the DMG bundle contain a symlink made up of only a space to /Applications. adds 3a296bd res/img/icons/dmg: add new image disk.svg, used as the basis for the new OS X DMG bundle icon. adds ad1034d res/img/icons/dmg: add new disk-drive-and-x2goclient icon for use as the volume icon of the OS X DMG bundle. adds 9818a3b macbuild.sh: use the new volume icon that actually also looks like a disk drive. Fixes: #930. adds d5d9856 Windows: Upgrade PulseAudio from 6.0 to 7.1 Fixes: #1152 adds 3ea4c49 Windows: Remove uninstaller from start menu. adds 82c805e Windows: Upgrade Win32 OpenSSL from 1.0.1t to 1.0.2k adds 16b67f8 Upgrade libssh from 0.7.0 to 0.7.4 adds 218db76 Whoops, put the libssh changelog note under the wrong version adds 69ee3e5 Windows: Update PuTTY from 0.67 to 0.68 adds d6123e2 src/help.cpp: add documentation for the --background option. Part of #1162. adds 12a567a {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: add new --branding option that replaces the seal logo. Fixes: #1162. adds d164a70 Don't override PATH for the actual session or application command. Fixes: #1100 adds 5c5d93d src/onmainwindow.cpp: typo fix only. adds f17597a src/onmainwindow.cpp: do not automatically set login user name to current system user if empty. adds 68bbf32 Interaction with SSH server (for example for changing expired password). Fixes: #592. adds ec515ab src/x2goclient.cpp: revert change bypassing the UNIX cleanup helper. adds 6b5dfa0 Fixing setting widget style issue in InteractionDialog on Windows client. adds 93ab054 SSH Interaction for SSH Broker and SSH Server. adds 42f3369 SSH Iteraction for method keyboard-interactive. adds 9128d9b Windows client. - Move PulseManager MsgBox functions to main window: GUI functions should be used only from main thread. adds 6dbf012 Check "norecord" option on the first start of PulseAudio. adds 1f2e09f Disable/Enable PulseAudio in config dialog. New command line options: --disable-pulse to disable start of PulseAudio --disable-pulse-record to disable audio input. adds db9039c Check if PulseAudio running at session start and resuming when sound is enabled. Show warning if PulseAudio not running and disable the sound support for the session to avoid session freezes. adds c8b1991 src/onmainwindow.cpp: revert old behavior and select user name field after a session has been suspended/terminated if user name was not provided. adds 898717b src/sshmasterconnection.cpp: fix SSH-proxied connections with port numbers of zero. adds bea0a60 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: let --background take a directory and randomly pick an SVG file in there. Fixes: #1165. adds 6274161 Makefile: add new QMAKE_OPTS variable so that packagers can pass additional options to qmake directly. adds 74db82d x2goclient.spec: respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info issues. adds 16cc48f src/sshmasterconnection.cpp: typo fix in log message only. adds ad89710 src/sshmasterconnection.cpp: don't leak ssh_session data, free it once we're done with it. adds f012dac src/sessionbutton.cpp: only append "XDM@" string to server text if a direct XDMCP session was requested. adds e62cf4f Makefile: qmake seems to act weird if QMAKE_C(XX)FLAGS starts with a space followed by additional non-whitespace characters. adds cedf870 Makefile: turns out the only somewhat portable way to do something like this is via shell hackery. adds 4dcd746 Makefile: reset to the original state and make sure that we don't pass CXXFLAGS on to the actual build process to not override the values generated by qmake. adds 0cda237 Makefile: the only way to prevent variables on the command line to be passed down seems to be to remove them from MAKEOVERRIDES. adds da584f0 Makefile: add comment explaining why we need to do this in the first place and why it's so complicated. adds ad62687 src/sshmasterconnection: ignore "garbage", but require at least one line to start with a known challenge auth prompt. Fixes: #966. adds 4a3f7fe x2goclient.pro: add libssh_threads library. adds 1f07f3c copy-deps-win32.bat: also copy libssh_threads.dll to go with the previous change. adds 07a37d3 src/{onmainwindow,sshmasterconnection}.{cpp,h}: correctly initialize and finalize libssh. adds 36552d1 Bump version to 4.1.1.0. adds 9af7ec4 debian/changelog: merge changelog from release/4.1.0.1 branch into master. adds 377cc91 src/sessionexplorer.cpp: open the correct tab when editing a session from the exports menu. adds fa5c8a2 src/onmainwindow.cpp: try to workaround window placement if settings contain a (newly) invalid position (e.g., a position that refers to a disconnected display.) adds 1309683 {src/{help.cpp,onmainwindow.{cpp,h}},man/man1/x2goclient.1}: pass-through broker credentials when connecting to a direct RDP session. Fixes: #1185. adds 44e3d2e src/onmainwindow.cpp: support --close-disconnect for direct RDP sessions. Fixes: #1186. adds 31c94ee src/onmainwindow.cpp: try to find a display that can hold the window's position fetched from the sizes settings. adds 8613150 src/onmainwindow.cpp: fix up main window position check; use QRect.intersects (). adds 07ce91e src/pulsemanager.{cpp,h}: rename shutdownState to shutdown_state_, reorder in initializer list. adds 1061c95 res/i18n/: regenerate translations. adds ba0d051 res/i18n/x2goclient_sv.ts: update Swedish translation file. adds 4bfb045 res/i18n/x2goclient_es.ts: update Spanish translation file. adds 7ca9d71 res/i18n/x2goclient_es.ts: fixup Spanish translation file. adds a0de3f5 res/i18n/x2goclient_et.ts: update Estonian translation file. adds 0ac3ade res/i18n/x2goclient_et.ts: fixup some typos in the Estonian translation file. adds 54cf408 res/i18n/x2goclient_sv.ts: add singular form to translation entry as discussed on list. adds 59a0e34 res/i18n/x2goclient_es.ts: add singular form to translation entry as discussed off list. adds 2556c92 res/i18n/x2goclient_nl.ts: update Dutch translation file. adds a2551b4 res/i18n/x2goclient_nl.ts: various fixups for Dutch translation file. adds 8954e62 res/i18n/x2goclient_nb_no.ts: update Bokmål (Norway) translation file. adds a4fcb55 res/i18n/x2goclient_nb_no.ts: various fixups for Bokmål (Norway) translation file. adds c6fc045 res/i18n/x2goclient_nl.ts: update Dutch translation file. adds 5038a87 res/i18n/x2goclient_nl.ts: fix whitespace issues in Dutch translation file and re-add numerus form translation. adds d6fb8fe res/i18n/x2goclient_nb_no.ts: update Bokmål (Norway) translation file. adds 7d27f2d res/i18n/x2goclient_nb_no.ts: various fixups for Bokmål (Norway) translation file, including numerus form. adds dd9c9f4 src/sshmasterconnection.cpp: for proxied connections, fetch the user name matching the given host, not proxy host. adds e9a52d4 res/i18n/x2goclient_fi.ts: update Finnish translation file. adds ce4895f res/i18n/x2goclient_fi.ts: various fixups for Finnish translation file. adds d778886 res/i18n/x2goclient_fi.ts: another tiny whitespace fixup for Finnish translation file. adds 791607e src/onmainwindow.cpp: fix "XMDCP" typo. adds ca4937b res/i18n/x2goclient_de.ts: update German translation file. adds d7e0fab res/i18n/x2goclient_de.ts: various fixups for German translation file. adds 2ccae19 src/onmainwindow.cpp: fix "loose" vs. "lose" spelling mistake. adds 167d9e3 res/i18n/x2goclient_et.ts: remove obsolete and wrongly capitalized "x2go" part from an Estonian translation message. adds e303193 res/i18n/x2goclient_sv.ts: minor whitespace fixup. adds 30ed98b res/i18n/x2goclient_*.ts: apply "XMDCP" -> "XDMCP" fix manually to translation files. adds 0dfcd3a res/i18n/x2goclient_nb_no.ts: remove obsolete comments (leading to problems when regenerating translation files.) adds c5155c6 res/i18n/x2goclient_nl.ts: remove obsolete comments (leading to problems when regenerating translation files.) adds 0fa3cc2 res/i18n/x2goclient_*.ts: regenerate translations. adds 9010431 res/i18n/x2goclient_fr.ts: update French translation file. adds 7b83af9 Add session config file option "sshproxysamekey". With this option client will use for proxy authentication same key as for X2Go server. This is important in first case for broker users, where key can be generated "on the fly". Maybe it makes sence to add this option in UI and command line later. adds 4a84a8f res/i18n/x2goclient_fi.ts: update Finnish translation file. adds 488813d res/i18n/x2goclient_fi.ts: various fixups for Finnish translation file. adds 3486824 Correct negative display coordinates for FS sessions. adds b6acc71 src/sshmasterconnection.cpp: spelling fix. (Quiting -> Quitting) adds 2345e56 x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp: spelling fix. (convertable -> convertible) adds f0fb9c4 release 4.1.1.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (5b8b16a) \ N -- N -- N refs/heads/build-main (f0fb9c4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: Makefile | 39 +- VERSION | 2 +- copy-deps-win32.bat | 7 +- debian/changelog | 344 ++++ macbuild.sh | 7 +- man/man1/x2goclient.1 | 7 +- nsis/x2goclient.nsi | 1 - res/i18n/x2goclient_da.ts | 1436 ++++++++------- res/i18n/x2goclient_de.ts | 1444 +++++++++------- res/i18n/x2goclient_es.ts | 1463 +++++++++------- res/i18n/x2goclient_et.ts | 2117 +++++++++++++---------- res/i18n/x2goclient_fi.ts | 1473 +++++++++------- res/i18n/x2goclient_fr.ts | 182 +- res/i18n/x2goclient_nb_no.ts | 398 +++-- res/i18n/x2goclient_nl.ts | 1680 ++++++++++-------- res/i18n/x2goclient_pt.ts | 1440 ++++++++------- res/i18n/x2goclient_ru.ts | 1449 ++++++++-------- res/i18n/x2goclient_sv.ts | 1446 +++++++++------- res/i18n/x2goclient_tr.ts | 1435 ++++++++------- res/i18n/x2goclient_zh_tw.ts | 1435 ++++++++------- res/img/icons/dmg/disk.svg | 1195 +++++++++++++ res/img/icons/dmg/x2go-mac-dmg.icns | Bin 0 -> 798525 bytes src/InteractionDialog.cpp | 158 ++ src/{exportdialog.h => InteractionDialog.h} | 66 +- src/configdialog.cpp | 51 +- src/configdialog.h | 7 + src/help.cpp | 7 +- src/httpbrokerclient.cpp | 33 +- src/httpbrokerclient.h | 1 + src/onmainwindow.cpp | 543 ++++-- src/onmainwindow.h | 31 + src/onmainwindow_privat.h | 1 + src/printdialog.cpp | 4 +- src/pulsemanager.cpp | 203 ++- src/pulsemanager.h | 20 +- src/sessionexplorer.cpp | 2 +- src/sessionwidget.cpp | 19 +- src/sshmasterconnection.cpp | 883 ++++++++-- src/sshmasterconnection.h | 19 +- src/sshprocess.cpp | 17 +- src/sshprocess.h | 2 +- src/version.h | 2 +- src/x2goutils.cpp | 6 +- src/x2goutils.h | 6 + x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 10 +- x2goclient.pro | 8 +- x2goclient.spec | 4 +- 48 files changed, 12868 insertions(+), 8237 deletions(-) create mode 100644 res/img/icons/dmg/disk.svg create mode 100644 res/img/icons/dmg/x2go-mac-dmg.icns create mode 100644 src/InteractionDialog.cpp copy src/{exportdialog.h => InteractionDialog.h} (61%) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git