[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.0-22-g7a76ed9

X2Go dev team git-admin at x2go.org
Fri Jun 7 20:47:35 CEST 2013


The branch, master has been updated
       via  7a76ed9a7b420ba037ccc8ab6073be566fcdd99a (commit)
      from  3c5222db2ea16590f6f80833547ac9b41c0d660b (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 7a76ed9a7b420ba037ccc8ab6073be566fcdd99a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 7 20:47:30 2013 +0200

    Properly set the remote server address received via selectUserSession method when in broker mode. (Fixes: #226).

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

Summary of changes:
 debian/changelog |    2 ++
 onmainwindow.cpp |   80 ++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 56 insertions(+), 26 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index afa6b9c..e3a1cd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low
     - Enable full access desktop sharing across user accounts.
     - Avoid multiple selectUserSession requests when in broker
       mode.
+    - Properly set the remote server address received via selectUserSession
+      method when in broker mode. (Fixes: #226).
 
   [ Ezra Bühler ]
   * New upstream version (4.0.1.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 71b9e1d..1d9ca54 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3286,17 +3286,21 @@ bool ONMainWindow::startSession ( const QString& sid )
         st=new X2goSettings(config.iniFile, QSettings::IniFormat);
 
     passForm->setEnabled ( false );
-    if(!embedMode)
-        host=st->setting()->value ( sid+"/host",
-                                    ( QVariant ) QString::null ).toString();
-    else
-        host=config.server;
     if(brokerMode)
     {
+        host=config.serverIp;
         sshPort=config.sshport;
-
         x2goDebug<<"Server: "<<host;
     }
+    else if (embedMode)
+    {
+        host=config.server;
+    }
+    else
+    {
+        host=st->setting()->value ( sid+"/host",
+                                    ( QVariant ) QString::null ).toString();
+    }
 
     QString cmd=st->setting()->value ( sid+"/command",
                                        ( QVariant ) QString::null ).toString();
@@ -3420,12 +3424,6 @@ bool ONMainWindow::startSession ( const QString& sid )
 
     delete st;
 
-    if(brokerMode)
-    {
-        host=config.serverIp;
-    }
-
-
     sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,autologin, krblogin, false, useproxy,proxyType,proxyserver,
                                        proxyport, proxylogin, proxypassword, proxyKey,proxyAutologin);
     return true;
@@ -4020,12 +4018,11 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
         rootless=st->setting()->value ( sid+"/rootless",
                                         ( QVariant ) false ).toBool();
 
-        if ( !embedMode )
+        if ( brokerMode )
         {
-            host=st->setting()->value ( sid+"/host",
-                                        ( QVariant ) s.server ).toString();
+            host = config.serverIp;
         }
-        else
+        else if ( embedMode )
         {
             startEmbedded=false;
             if ( st->setting()->value ( sid+"/startembed",
@@ -4056,6 +4053,11 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
                 usekbd=true;
             }
         }
+        else
+        {
+            host=st->setting()->value ( sid+"/host",
+                                        ( QVariant ) s.server ).toString();
+        }
         delete st;
     }
 
@@ -4469,17 +4471,21 @@ void ONMainWindow::slotSuspendSess()
                      S_SERVER ).data().toString();
     if ( !useLdap )
     {
-        if ( !embedMode )
+        if ( brokerMode )
+        {
+            host=config.serverIp;
+        }
+        if ( embedMode )
+        {
+            host=config.server;
+        }
+        else
         {
             X2goSettings st ( "sessions" );
             QString sid=lastSession->id();
             host=st.setting()->value ( sid+"/host",
                                        ( QVariant ) host ).toString();
         }
-        else
-        {
-            host=config.server;
-        }
     }
     else
     {
@@ -4864,7 +4870,15 @@ void ONMainWindow::slotRetResumeSess ( bool result,
     }
     if ( !useLdap )
     {
-        if ( !embedMode )
+        if ( brokerMode )
+        {
+            host=config.serverIp;
+        }
+        else if ( embedMode )
+        {
+            host=config.server;
+        }
+        else
         {
             X2goSettings st ( "sessions" );
 
@@ -4872,8 +4886,6 @@ void ONMainWindow::slotRetResumeSess ( bool result,
             host=st.setting()->value ( sid+"/host",
                                        ( QVariant ) host ).toString();
         }
-        else
-            host=config.server;
         resumingSession.server=host;
     }
 
@@ -5781,10 +5793,18 @@ void ONMainWindow::setStatStatus ( QString status )
         statusBar()->hide();
 #endif
         QString srv;
-        if ( embedMode )
+        if ( brokerMode )
+        {
+            srv=config.serverIp;
+        }
+        else if ( embedMode )
+        {
             srv=config.server;
+        }
         else
+        {
             srv=resumingSession.server;
+        }
         slVal->setText ( resumingSession.sessionId+"\n"+
                          srv+"\n"+
                          getCurrentUname() +"\n"+
@@ -5801,7 +5821,15 @@ void ONMainWindow::setStatStatus ( QString status )
     else
     {
 
-        QString srv=config.server;
+        QString srv;
+        if ( brokerMode )
+        {
+            srv=config.serverIp;
+        }
+        else
+        {
+            srv=config.server;
+        }
         QString message=getCurrentUname() +"@"+
                         srv+
                         ", "+tr ( "Session" ) +": "+


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




More information about the x2go-commits mailing list