This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 91906e6cf446a8f276df330660aee3d700ebc1a6 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jun 3 00:23:51 2015 +0200 x2goutils.{cpp,h}: new show_RichText_ErrorMsgBox() function as a wrapper for show_RichText_Generic_MsgBox() with a critical icon. --- debian/changelog | 2 ++ src/x2goutils.cpp | 3 +++ src/x2goutils.h | 1 + 3 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6987a0c..eeff2cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low designed to replace the show_RichText_WarningMsgBox() function. - x2goutils.{cpp,h}: make show_RichText_WarningMsgBox() use show_RichText_Generic_MsgBox (). + - x2goutils.{cpp,h}: new show_RichText_ErrorMsgBox() function as a wrapper + for show_RichText_Generic_MsgBox() with a critical icon. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 May 2015 21:42:09 +0200 diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp index dfe818f..3c37050 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -107,7 +107,10 @@ void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_t void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text) { show_RichText_Generic_MsgBox (QMessageBox::warning, main_text, informative_text); +} +void show_RichText_ErrorMsgBox (const QString &main_text, const QString &informative_text) { + show_RichText_Generic_MsgBox (QMessageBox::Critical, main_text, informative_test); } QString git_changelog_extract_commit_sha (const QString &gitlog) { diff --git a/src/x2goutils.h b/src/x2goutils.h index 02ec4b2..834705a 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -34,6 +34,7 @@ QString convert_to_rich_text (const QString &text, bool force = false); void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_text, const QString &informative_text); void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text = ""); +void show_RichText_ErrorMsgBox (const QString &main_text, const QString &informative_text = ""); QString git_changelog_extract_commit_sha (const QString &gitlog); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git