[X2Go-Commits] [x2goclient] branch bugfix/osx updated (169c9c2 -> 1316647)

git-admin at x2go.org git-admin at x2go.org
Mon Apr 27 21:23:25 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch bugfix/osx
in repository x2goclient.

  discards  169c9c2   compat.h: include QtCore/qglobal.h for Q_OS_... macros.
  discards  fd87eb0   compat.{cpp,h}: remove inline keyword, because function is not defined in header file.
  discards  372f50b   compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below. Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo.
  discards  6882d4d   onmainwindow.cpp: correctly use ~/.x2go/.ssh as ssh directory when starting sshd in user mode.
  discards  ef3c90f   appdialog.cpp: initialize parent in default case. Another GCC compile warning fix.
  discards  9d27a85   {appdialog,configwidget,onmainwindow,unixhelper}.cpp: fix some compile warnings with GCC. Fix a few whitespace issues.
  discards  cd2d6c0   x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector.
  discards  68a38d9   unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1 and SIGUSR2.
  discards  85928a4   {unixhelper.{cpp,h},x2goclient.cpp}: switch main cleanup handling to parent PID polling.
  discards  906246a   unixhelper.{cpp,h}: raise sleeping time to two seconds and grace period to 10 seconds.
  discards  0ff6666   x2goclient.cpp: create new argv array on the heap instead of on the stack.
  discards  1bf8943   x2goclient.cpp: fix string comparison.
  discards  7eecb50   x2goclient.cpp: fix compile problems introduced with the last commit.
  discards  a2202ee   x2goclient.cpp: don't start the UNIX cleanup helper process right after forking.
  discards  0bb7a9c   x2goclient.cpp: clean up.
  discards  9486526   unixhelper.cpp: port from std::signal() to sigactio(). Handle errors.
  discards  7c986bb   unixhelper.{cpp,h}: implement signal unblocking in unixhelper::unix_cleanup(). Update documentation.
  discards  a68ab86   unixhelper.cpp: kill process group on error.
  discards  e70dbf4   x2goclient.cpp: return return value of unixhelper::unix_cleanup().
  discards  a64492e   unixhelper.{cpp,h}: add documentation/comments.
  discards  4938308   unixhelper.{cpp,h},x2goclient.cpp}: unixhelper should really be a (module) namespace, not a class.
  discards  4d6fe8d   unixhelper.h: forgot to declare type of unix_cleanup() function.
  discards  dfe21de   unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around.
  discards  894fc4e   x2goclient.cpp: fix std::edit -> std::exit typo.
  discards  2f25ede   x2goclient.cpp: add legacy <sys/types.h> header needed for old operating systems.
  discards  acfd2df   x2goclient.cpp: add myself to copyright header.
  discards  05e6da9   x2goclient.cpp: use setsid() on UNIX to become session and process group leader.
  discards  3a9bf5d   x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup helper.
  discards  7b78209   x2goclient.cpp: wrap X2Go Client main function and use that.
  discards  139bfd0   unixhelper.{cpp,h}: implement cleanup program for process group.
  discards  d9a85cd   {unixhelper.{cpp,h},x2goclient.pro{maemo}}: add unixhelper stub.
      adds  8008873   debian/changelog: add closure for #830
      adds  bfd5d50   Update bundled VcXsrv from 1.15.2.4-xp+vc2013+x2go1 to 1.15.2.5
      adds  07f56fc   Update Cygwin bundle for openssl 1.0.2a-1 update
      adds  3b55932   Update changelog about Win32 OpenSSL update from 1.0.1L to 1.0.1m
      adds  22aa6ca    Windows: Update bundled PuTTY from 0.63 to 0.64.
      adds  0038d25   onmainwindow.cpp: quote commands for generating pulse-client.conf correctly, add more quotes and use absolute file path for pulse cookie.
      adds  e843170   onmainwindow.cpp: fix up typo when specifying cookie file in pulse-client.conf.
      adds  3cba555   src/version.h: add include guard.
      adds  c6539db   help.{cpp,h}: add skeleton for new help system.
      adds  8587ec4   help.{cpp,h}: add sanitizing helpers.
      adds  abebff1   help.{cpp,h}: fix missing return type.
      adds  b8088ba   help.cpp: populate pretty_print: fetch max length of params.
      adds  d9d7fbe   help.cpp: get terminal window sizes on UNIX-based and Windows operating systems.
      adds  6f55b84   help.cpp: complete pretty printer function.
      adds  082af3f   help.cpp: "copy" old command line parameters.
      adds  d80caf9   help.cpp: document broker options. Fixes: #851.
      adds  61889c7   help.cpp: actually output the help message.
      adds  f6a07c5   help.{cpp,h}: also pass the help message on (for display in graphical mode.)
      adds  da6d831   x2goclient.pro{,.maemo}: add new help.{cpp,h} files.
      adds  ac62882   onmainwindow.cpp: replace old help system with new one.
      adds  bbddcc4   {{onmainwindow,help}.cpp},helph}: fix misc. build errors.
      adds  462e8f2   help.h: fix run time error by actually giving QTextStream a "device" to write to.
      adds  e14d428   help.cpp: clear current string if completely written onto one line.
      adds  5bf8eb1   help.cpp: enable debugging for pretty_print(). --debug must be supplied before --help for this to work.
      adds  7772507   help.cpp: partly fix indenting algorithm.
      adds  fb9b1b0   help.cpp: actually recalculate the new indent *before* writing whitespace.
      adds  d3ff608   help.cpp: fix splitting algorithm to step over a space character, but include hyphens correctly into the current line.
      adds  28a111d   help.cpp: don't let qCritical() add even more spaces or quotes around the help message.
      adds  37b20f9   help.cpp: add support for newlines within descriptions.
      adds  50378fa   help.cpp: use new newline feature for some options.
      adds  abf9161   help.cpp: switch from do { ... } while (...); to just while (...) { ... }.
      adds  e1013d8   help.cpp: trying to split at hyphens was a bad idea. Remove that part.
      adds  729415a   help.cpp: fix a compile warning (by including winsock2.h) and error (caused by a typo) on Windows.
      adds  b2024e4   help.cpp: hardcode indentation value to 2 (for the first spaces) + maximum length of parameters + 4 (for the trailing 4 spaces).
      adds  95f1ee1   x2goutils.{cpp,h}: implement new git_changelog_extract_commit_sha helper, extracting the most recent commit shasum from a git changelog string.
      adds  6e89f0e   help.cpp: use new git_changelog_extract_commit_sha() helper while building the help prelude.
      adds  a01b282   x2goutils.{cpp,h}: reformat only.
      adds  47c59d8   helpdialog.cpp: change to monospaced font.
      adds  5372761   helpdialog.{cpp,h}: whitespace only.
      adds  8462740   helpdialog.cpp: use QT_VERSION macro to select either a monospaced or typewriter font (Qt < 4.7.0 only supports TypeWriter.)
      adds  4fd874a   x2goutils.{cpp,h}: add new font_is_monospaced() helper.
      adds  739e2e1   helpdialog.cpp: try harder to set a monospaced font.
      adds  a944db8   helpdialog.cpp: lower font size to have more space for text.
      adds  2ee86a4   ui/helpdialog.ui: almost double the window size.
      adds  0fe6b3a   {helpdialog.cpp,x2goutils.h}: whitespace only.
      adds  5734a0d   help.cpp: typo fix for --git-info.
      adds  bf9294c   help.{cpp,h}: provide string splitting logic as separate split_long_line() function. Use this in pretty_print().
      adds  dbaba2f   help.cpp: simplify pretty_print() and make it also split lines for non-terminal output or when the terminal width is unknown.
      adds  6e7ca03   help.cpp: move functions around a bit.
      adds  3d58218   help.{cpp,h}: add a boolean terminal_output parameter to the pretty_print() function family.
      adds  dc2c70c   onmainwindow.cpp: don't let a potential terminal affect the help string shown in the GUI.
      adds  d9e4716   help.h: lower default splitting length to 100 characters.
      adds  cd47266   x2goutils.{cpp,h}: fix compile issue -- include QFont and QFontUtils.
      adds  ee11aa4   onmainwindow.cpp: fix up pulse config file generation and PULSE_CLIENTCONFIG setting once more.
      adds  505d4e0   Windows: Upgrade bundled PulseAudio from 5.0-rev18 to 6.0-11.1
      adds  072dfa6   src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798.
      adds  467c7ce   Update cygwin bundle from 20141018-5 to 20150425-2
      adds  b5eb6bd   Add more relevant info to changelog.
      adds  c1addef   {macbuild,res/osxbundle/postbuild}.sh: add support for git information if not building from a tag.
       new  d37b446   {unixhelper.{cpp,h},x2goclient.pro{maemo}}: add unixhelper stub.
       new  c1071f6   unixhelper.{cpp,h}: implement cleanup program for process group.
       new  33554ac   x2goclient.cpp: wrap X2Go Client main function and use that.
       new  53e349f   x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup helper.
       new  7d6bd56   x2goclient.cpp: use setsid() on UNIX to become session and process group leader.
       new  fbf81f1   x2goclient.cpp: add myself to copyright header.
       new  7fdb0a9   x2goclient.cpp: add legacy <sys/types.h> header needed for old operating systems.
       new  d9227c1   x2goclient.cpp: fix std::edit -> std::exit typo.
       new  c338198   unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around.
       new  1c04711   unixhelper.h: forgot to declare type of unix_cleanup() function.
       new  945f3fe   unixhelper.{cpp,h},x2goclient.cpp}: unixhelper should really be a (module) namespace, not a class.
       new  a08e210   unixhelper.{cpp,h}: add documentation/comments.
       new  eab2927   x2goclient.cpp: return return value of unixhelper::unix_cleanup().
       new  7e908a2   unixhelper.cpp: kill process group on error.
       new  3b17a71   unixhelper.{cpp,h}: implement signal unblocking in unixhelper::unix_cleanup(). Update documentation.
       new  525be63   unixhelper.cpp: port from std::signal() to sigactio(). Handle errors.
       new  35501f2   x2goclient.cpp: clean up.
       new  cafcd46   x2goclient.cpp: don't start the UNIX cleanup helper process right after forking.
       new  9e8335b   x2goclient.cpp: fix compile problems introduced with the last commit.
       new  eedcb39   x2goclient.cpp: fix string comparison.
       new  cc23655   x2goclient.cpp: create new argv array on the heap instead of on the stack.
       new  53a1864   unixhelper.{cpp,h}: raise sleeping time to two seconds and grace period to 10 seconds.
       new  ad7a0d8   {unixhelper.{cpp,h},x2goclient.cpp}: switch main cleanup handling to parent PID polling.
       new  38a268f   unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1 and SIGUSR2.
       new  52a7757   x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector.
       new  01351e8   {appdialog,configwidget,onmainwindow,unixhelper}.cpp: fix some compile warnings with GCC. Fix a few whitespace issues.
       new  bab5e5d   appdialog.cpp: initialize parent in default case. Another GCC compile warning fix.
       new  8ae75d7   onmainwindow.cpp: correctly use ~/.x2go/.ssh as ssh directory when starting sshd in user mode.
       new  2ee5850   compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below. Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo.
       new  a6f2b3d   compat.{cpp,h}: remove inline keyword, because function is not defined in header file.
       new  1316647   compat.h: include QtCore/qglobal.h for Q_OS_... macros.

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   (169c9c2)
            \
             N -- N -- N   refs/heads/bugfix/osx (1316647)

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.

The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 copy-deps-win32.bat         |    8 +-
 debian/changelog            |  125 ++++++++++++++++--
 macbuild.sh                 |    7 +
 res/osxbundle/postbuild.sh  |   14 +-
 src/help.cpp                |  298 +++++++++++++++++++++++++++++++++++++++++++
 src/help.h                  |   70 ++++++++++
 src/helpdialog.cpp          |   43 +++++--
 src/helpdialog.h            |   13 +-
 src/onmainwindow.cpp        |  267 +++++++++++++++++++-------------------
 src/sshmasterconnection.cpp |    5 +-
 src/ui/helpdialog.ui        |    8 +-
 src/version.h               |    5 +
 src/x2goutils.cpp           |   62 +++++++--
 src/x2goutils.h             |   16 ++-
 x2goclient.pro              |    2 +
 x2goclient.pro.maemo        |    2 +
 16 files changed, 756 insertions(+), 189 deletions(-)
 create mode 100644 src/help.cpp
 create mode 100644 src/help.h

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list