[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.6-2-g3f4eab5

[X2go dev team]

The branch, master has been updated
       via  3f4eab56698f439deda4cce7629aef9558a5e9ac (commit)
      from  817c331b9f53936c2e09c81d30ac07e68a74d208 (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 3f4eab56698f439deda4cce7629aef9558a5e9ac
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Wed Feb 1 14:47:26 2012 +0100

    Get new ports from x2goresume-session if reserved ports are busy

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

Summary of changes:
 debian/changelog       |    4 ++++
 onmainwindow_part2.cpp |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a5cae42..b4c9eef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low
 
+  [ Mike Gabriel ]
   * Continue development...
 
+  [ Oleksandr Shneyder ]
+  * Get new ports from x2goresume-session if reserved ports are busy
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 14:07:55 +0100
 
 x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low
diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp
index 6201f5b..d228cb9 100644
--- a/onmainwindow_part2.cpp
+++ b/onmainwindow_part2.cpp
@@ -1553,7 +1553,28 @@ void ONMainWindow::slotRetResumeSess ( bool result,
         }
     }
     else
+    {
         host=resumingSession.server;
+        QStringList outputLines=output.split("\n",QString::SkipEmptyParts);
+        foreach(QString line,outputLines)
+        {
+            if (line.indexOf("gr_port=")!=-1)
+            {
+                resumingSession.grPort=line.replace("gr_port=","");
+                x2goDebug<<"new gr_port: "<<resumingSession.grPort<<endl;
+            }
+            if (line.indexOf("sound_port=")!=-1)
+            {
+                resumingSession.sndPort=line.replace("sound_port=","");
+                x2goDebug<<"new sound_port: "<<resumingSession.sndPort<<endl;
+            }
+            if (line.indexOf("fs_port=")!=-1)
+            {
+                resumingSession.fsPort=line.replace("fs_port=","");
+                x2goDebug<<"new fs_port: "<<resumingSession.fsPort<<endl;
+            }
+        }
+    }
     if ( !useLdap )
     {
         if ( !embedMode )


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