[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.2.2-62-gf2b6a54

[X2Go dev team]

The branch, master has been updated
       via  f2b6a54b89c6b8811bb85bedd376ac74621bc97b (commit)
       via  1bfe21ef836ad753eb5c93d60c67f735f3345680 (commit)
      from  1a18755e735f8624a8f95af5a916bee1ac4c8701 (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 f2b6a54b89c6b8811bb85bedd376ac74621bc97b
Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Date:   Mon Oct 1 11:32:47 2012 +0200

    fixed visibility of SSH-proxy box with direct RDP sessions

commit 1bfe21ef836ad753eb5c93d60c67f735f3345680
Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Date:   Mon Oct 1 11:28:57 2012 +0200

    reduce listen interval for ssh-tunnell to 100 msec

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog  |    2 ++
 sessionwidget.cpp |    2 +-
 sshprocess.cpp    |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1650c8e..42f5655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,8 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
     - Commandline options --broker-noauth.
     - Support for SSH broker. --broker-user removed, use username in broker url
       instead.
+    - reduce listen interval for ssh-tunnell to 100 msec
+    - fixed visibility of SSH-proxy box with direct RDP sessions 
 
   [ Ricardo Diaz ]
   * New upstream version (3.99.3.0):
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 0d4d90c..c16120a 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -313,7 +313,7 @@ void SessionWidget::slot_proxyGetKey()
 
 void SessionWidget::slot_proxyOptions()
 {
-    proxyBox->setVisible(cbProxy->isChecked());
+    proxyBox->setVisible(cbProxy->isChecked() && cbProxy->isVisible());
 }
 
 void SessionWidget::slot_proxySameLogin()
diff --git a/sshprocess.cpp b/sshprocess.cpp
index 11f342c..7050354 100644
--- a/sshprocess.cpp
+++ b/sshprocess.cpp
@@ -136,7 +136,7 @@ void SshProcess::tunnelLoop()
     addrlen=sizeof(struct sockaddr_in);
     QTimer* timer=new QTimer();
     connect(timer,SIGNAL(timeout()),this,SLOT(slotCheckNewConnection()));
-    timer->start(500);
+    timer->start(100);
     emit sshTunnelOk();
 #ifdef DEBUG
     x2goDebug<<"Direct tunnel: waiting for connections on "<<localHost<<":"<<localPort<<endl;


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).