This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c11e697 x2goutils.cpp: fix compile error. tr () is a member of QObject and must be explicitly marked as such in a free function. new e7f48c2 {configdialog.{cpp,h},onmainwindow.cpp}: miscellaneous typo fixes - no functional changes. 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 | 2 ++ src/configdialog.cpp | 4 ++-- src/configdialog.h | 2 +- src/onmainwindow.cpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit e7f48c2cda8a4f9467c0fe999145d8704c045741 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 23:57:19 2015 +0200 {configdialog.{cpp,h},onmainwindow.cpp}: miscellaneous typo fixes - no functional changes. --- debian/changelog | 2 ++ src/configdialog.cpp | 4 ++-- src/configdialog.h | 2 +- src/onmainwindow.cpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd94177..c1ea48d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -346,6 +346,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low the same message. - x2goutils.cpp: fix compile error. tr () is a member of QObject and must be explicitly marked as such in a free function. + - {configdialog.{cpp,h},onmainwindow.cpp}: miscellaneous typo fixes - no + functional changes. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/configdialog.cpp b/src/configdialog.cpp index b58ca27..0b9701b 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -413,7 +413,7 @@ void ConfigDialog::slot_accepted() mediaWidget->saveSettings(); conWidg->saveSettings(); } -#if defined ( Q_OS_WIN) && defined (CFGCLIENT ) +#if defined (Q_OS_WIN) && defined (CFGCLIENT) xsetWidg->saveSettings(); #endif } @@ -654,7 +654,7 @@ void ConfigDialog::slotDefaults() #endif } break; -#if defined ( Q_OS_WIN) && defined (CFGCLIENT ) +#if defined (Q_OS_WIN) && defined (CFGCLIENT) case 2: { xsetWidg->setDefaults(); diff --git a/src/configdialog.h b/src/configdialog.h index e4602b6..3e1d9a4 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -89,7 +89,7 @@ private: SettingsWidget* setWidg; MediaWidget* mediaWidget; -#if defined ( Q_OS_WIN) && defined (CFGCLIENT ) +#if defined (Q_OS_WIN) && defined (CFGCLIENT) XSettingsWidget* xsetWidg; #endif diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index a661ed1..9193d92 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3611,7 +3611,7 @@ void ONMainWindow::startNewSession() if ( host==QString::null ) { QMessageBox::critical ( 0l,tr ( "Error" ), - tr ( "No server availabel" ), + tr ( "No server available" ), QMessageBox::Ok, QMessageBox::NoButton ); return; @@ -3620,7 +3620,7 @@ void ONMainWindow::startNewSession() if (!sshConnection) { QMessageBox::critical ( 0l,tr ( "Error" ), - tr ( "Server not availabel" ), + tr ( "Server not available" ), QMessageBox::Ok, QMessageBox::NoButton ); return; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org