[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.2.2-37-gdcdb037

[X2Go dev team]

The branch, master has been updated
       via  dcdb0371a55c40358f695f6088038c2d101ab3c4 (commit)
      from  26d4c8a85d433bf31b42473b84032816aa40dc6e (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 dcdb0371a55c40358f695f6088038c2d101ab3c4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Sep 13 21:47:12 2012 +0200

    Only replace username+password if they received a value from the login widget of the main window.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 40ce27e..cdfc00f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
     - Allow pass-through of username and password for X2Go-proxied RDP
       sessions. The strings X2GO_USER and X2GO_PASSWORD in rdpoptions
       will be replaced by username+password enter into X2Go Clients
-      login dialog.
+      login dialog. Only replace username+password if they received a
+      value from the login widget of the main window.
   * Add rdesktop and xfreerdp to Recommends.
 
   [ Daniel Lindgren ]
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 9938e35..c67a0ea 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5611,8 +5611,12 @@ void ONMainWindow::runCommand()
             rdpOpts=st->setting()->value (
                         sid+"/rdpoptions",
                         ( QVariant ) "" ).toString();
-            rdpOpts.replace("X2GO_USER", user);
-            rdpOpts.replace("X2GO_PASSWORD", passwd);
+            if ( user != "" ) {
+                rdpOpts.replace("X2GO_USER", user);
+            }
+            if ( passwd != "" ) {
+                rdpOpts.replace("X2GO_PASSWORD", passwd);
+            }
             rdpServer=st->setting()->value (
                           sid+"/rdpserver",
                           ( QVariant ) "" ).toString();


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