The branch, master has been updated via b3121c46cd4494b6d15cf644292f290bf0dadc91 (commit) from 11e960045237f9a303a4d9a6c7be24db3f494946 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b3121c46cd4494b6d15cf644292f290bf0dadc91 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Feb 13 15:46:46 2013 +0100 Launching parec to init pulseaudio input only on Windows ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 6 +++++- onmainwindow.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3cd0b94..034b01c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * Continue new feature development... + [ Oleksandr Shneyder ] + * Launching parec to init pulseaudio input only on Windows + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 x2goclient (4.0.0.2-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 31aaf7f..acef85f 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -10593,8 +10593,10 @@ void ONMainWindow::printSshDError() QMessageBox::Ok,QMessageBox::NoButton ); } +#ifdef Q_OS_WIN void ONMainWindow::slotStartParec () { + if ( !parecTunnelOk ) { // wait 1 sec and try again @@ -10611,7 +10613,7 @@ void ONMainWindow::slotStartParec () sshConnection->executeCommand ( scmd ); } - +#endif void ONMainWindow::slotSndTunOk() { @@ -10623,8 +10625,10 @@ void ONMainWindow::slotPCookieReady ( bool result, QString , int ) { +#ifdef Q_OS_WIN if ( result ) slotStartParec(); +#endif } diff --git a/onmainwindow.h b/onmainwindow.h index 5865cd2..5a48cba 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -909,6 +909,7 @@ private slots: void slotCheckXOrgLog(); void slotCheckXOrgConnection(); void slotCheckPulse(); + void slotStartParec (); #endif private slots: void slotAppDialog(); @@ -1040,7 +1041,6 @@ private slots: void slotAttachProxyWindow(); void slotEmbedIntoParentWindow(); void slotEmbedWindow(); - void slotStartParec (); void slotSndTunOk(); void slotPCookieReady ( bool result,QString output, int proc ); hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).