[X2Go-Commits] [x2goclient] branch bugfix/general updated (ffc56f3 -> 4776273)

git-admin at x2go.org git-admin at x2go.org
Thu Mar 12 06:29:29 CET 2015


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

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

  discards  ffc56f3   onmainwindow.{cpp,h}: make slotTunnelOk parameter optional and use the non-parameter call for the QSingleShotTimer::timeout() signal.
      adds  5ff18d9   {x2goclient.pro,res/osxbundle/{Info.plist,postbuild.sh}}:
      adds  e232e50   onmainwindow.cpp: consolidate Windows and non-Windows sshd startup error message.
      adds  b447387   onmainwindow.cpp: typo fix (authoized_keys.)
      adds  b5868aa   onmainwindow.cpp: stop exporting directories (Printing, File Sharing) on sshd error.
      adds  7b18f20   onmainwindow.cpp: fix session icon not being displayed as tray icon (missed legacy resource URI wrapper call.)
      adds  cdf4cbe   configdialog.cpp: update XQuartz outdated version info message and links. Add MacPorts reference.
      adds  551078c   configdialog.cpp:
      adds  a154a6c   x2goutils.{h,cpp}: use QString references.
      adds  f86629a   x2goutils.{h,cpp}: add new helper function show_RichText_WarningMsgBox.
      adds  bd06b93   configdialog.cpp: use new helper function show_RichText_WarningMsgBox to show proper errors.
      adds  f5443ca   configdialog.cpp: return empty strings as paths to the XQuartz application if no valid one could be found in order to show the proper error message.
      adds  bcf498f   configdialog.cpp: rephrase another error message, use the new helper and reformat code.
       new  4776273   onmainwindow.{cpp,h}: make slotTunnelOk parameter optional and use the non-parameter call for the QSingleShotTimer::timeout() signal.

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   (ffc56f3)
            \
             N -- N -- N   refs/heads/bugfix/general (4776273)

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 1 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:
 debian/changelog           |   28 +++++++
 res/osxbundle/Info.plist   |    6 +-
 res/osxbundle/postbuild.sh |   21 +++++
 src/configdialog.cpp       |  182 ++++++++++++++++++++++++++------------------
 src/onmainwindow.cpp       |   55 ++++++-------
 src/x2goutils.cpp          |   26 ++++++-
 src/x2goutils.h            |    6 +-
 x2goclient.pro             |    6 +-
 8 files changed, 222 insertions(+), 108 deletions(-)
 create mode 100755 res/osxbundle/postbuild.sh

--
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