This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 7d088bbbae01daf69f61b0c5ea60a99cedce457c Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jun 3 00:21:42 2015 +0200 x2goutils.{cpp,h}: make show_RichText_WarningMsgBox() use show_RichText_Generic_MsgBox (). --- debian/changelog | 2 ++ src/x2goutils.cpp | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8c1b6d..6987a0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low misnomer. - x2goutils.{cpp,h}: add new show_RichText_Generic_MsgBox() main function designed to replace the show_RichText_WarningMsgBox() function. + - x2goutils.{cpp,h}: make show_RichText_WarningMsgBox() use + show_RichText_Generic_MsgBox (). -- 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 21575fa..dfe818f 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -106,16 +106,8 @@ void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_t } void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text) { - QString fixup_main_text (convert_to_rich_text (main_text)); - QString fixup_informative_text (convert_to_rich_text (informative_text, true)); + show_RichText_Generic_MsgBox (QMessageBox::warning, main_text, informative_text); - QMessageBox msg_box (QMessageBox::Warning, QString ("X2Go Client"), - fixup_main_text, NULL); - - msg_box.setTextFormat (Qt::RichText); - msg_box.setInformativeText (fixup_informative_text); - msg_box.setWindowModality (Qt::WindowModal); - msg_box.exec (); } 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