This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6e89f0e4bbc850dcb23bfae2865446abae16abd9 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 23 04:10:15 2015 +0200 help.cpp: use new git_changelog_extract_commit_sha() helper while building the help prelude. --- debian/changelog | 2 ++ src/help.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7aaf7f8..0488684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -293,6 +293,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - x2goutils.{cpp,h}: implement new git_changelog_extract_commit_sha helper, extracting the most recent commit shasum from a git changelog string. + - help.cpp: use new git_changelog_extract_commit_sha() helper while + building the help prelude. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index fb44394..718f18b 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -40,6 +40,7 @@ #include "version.h" #include "x2gologdebug.h" #include "onmainwindow.h" +#include "x2goutils.h" help::prelude_t help::cleanup_prelude (help::prelude_t prelude) { for (help::prelude_t::iterator it = prelude.begin (); it != prelude.end (); ++it) { @@ -72,6 +73,7 @@ help::prelude_t help::build_prelude () { QTextStream stream (&file); QString git_info (stream.readAll ().trimmed ()); + git_info = git_changelog_extract_commit_sha (git_info); if (!(git_info.isEmpty ())) { ver.append (" (Git information: " + git_info + ")"); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git