[X2Go-Commits] [x2goclient] 01/02: src/onmainwindow.{cpp, h}: remove left-over parec references and code.
git-admin at x2go.org
git-admin at x2go.org
Sat Dec 31 01:31:06 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 8409b5d538fc9c09d456ff5257090fe843899ac1
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Dec 15 09:29:40 2016 +0100
src/onmainwindow.{cpp,h}: remove left-over parec references and code.
---
debian/changelog | 1 +
src/onmainwindow.cpp | 41 +----------------------------------------
src/onmainwindow.h | 3 ---
3 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c47241f..770982d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -506,6 +506,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- src/pulsemanager.cpp: cast the return value of realloc () to char*, as
GCC doesn't seem to like reassigning the pointer otherwise.
- src/unix_stdint.h: use same hack to import ssize_t into std namespace.
+ - src/onmainwindow.{cpp,h}: remove left-over parec references and code.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 6223ce7..4e617ea 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5335,7 +5335,6 @@ void ONMainWindow::slotRetResumeSess ( bool result,
"/.pulse-cookie";
sshConnection->copyFile(cooFile,
destFile, this, SLOT ( slotPCookieReady ( bool, QString,int )));
- parecTunnelOk=true;
#endif /* !defined (Q_OS_WIN) && !defined (Q_OS_DARWIN) */
}
}
@@ -5371,18 +5370,10 @@ void ONMainWindow::slotRetResumeSess ( bool result,
#endif /* !defined (Q_OS_WIN) && !defined (Q_OS_DARWIN) */
if ( sshSndTunnel )
{
- const char* okSlot=0;
-#ifdef Q_OS_WIN /* FIXME: Do we need explicit parec support in PulseManager? */
- if ( sndSystem==PULSE )
- {
- parecTunnelOk=false;
- okSlot=SLOT ( slotSndTunOk() );
- }
-#endif
sndTunnel=sshConnection->startTunnel (
"localhost",
resumingSession.sndPort.toInt(),"127.0.0.1",
- sndPort.toInt(),true,this,okSlot, SLOT (
+ sndPort.toInt(),true,this,NULL, SLOT (
slotSndTunnelFailed ( bool,
QString,
int ) ));
@@ -12197,43 +12188,13 @@ void ONMainWindow::printSshDError_noAuthorizedKeysFile()
QMessageBox::Ok,QMessageBox::NoButton );
}
-#ifdef Q_OS_WIN
-void ONMainWindow::slotStartParec ()
-{
-
- if ( !parecTunnelOk )
- {
-// wait 1 sec and try again
- QTimer::singleShot ( 1000, this, SLOT ( slotStartParec() ) );
- return;
- }
- QString passwd=getCurrentPass();
- QString user=getCurrentUname();
- QString host=resumingSession.server;
- QString scmd="PULSE_CLIENTCONFIG=\"${HOME}/.x2go/C-"+
- resumingSession.sessionId+
- "/.pulse-client.conf\" "+
- "parec 1> /dev/null & sleep 1 && kill %1";
-}
-#endif
-
-void ONMainWindow::slotSndTunOk()
-{
- parecTunnelOk=true;
-}
-
void ONMainWindow::slotPCookieReady ( bool result,
QString ,
int )
{
-#ifdef Q_OS_WIN
- if ( result )
- slotStartParec();
-#else
/* Silence warning. */
UNUSED (result);
-#endif /* defined (Q_OS_WIN) */
}
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index 433dfad..aa30339 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -776,7 +776,6 @@ private:
bool runStartApp;
bool ldapOnly;
bool isScDaemonOk;
- bool parecTunnelOk;
#ifdef Q_OS_LINUX
bool directRDP;
#endif
@@ -990,7 +989,6 @@ private slots:
void startWinServers(key_types key_type = RSA_KEY_TYPE);
void slotCheckXOrgLog();
void slotCheckXOrgConnection();
- void slotStartParec ();
#endif
#if defined (Q_OS_DARWIN) || defined (Q_OS_WIN)
@@ -1127,7 +1125,6 @@ private slots:
void slotAttachProxyWindow();
void slotEmbedIntoParentWindow();
void slotEmbedWindow();
- void slotSndTunOk();
void slotPCookieReady ( bool result,QString output,
int proc );
void slotEmbedToolBar();
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list