[X2Go-Commits] [x2goclient] 03/05: onmainwindow.cpp: remove now-bogus double quote escaping.

git-admin at x2go.org git-admin at x2go.org
Thu Jun 11 04:23:22 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit cbab95c6334d9440988b66b557ba009ccc76dd3d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jun 11 03:32:15 2015 +0200

    onmainwindow.cpp: remove now-bogus double quote escaping.
---
 debian/changelog     |    1 +
 src/onmainwindow.cpp |   15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0baa7b8..16df554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
       arguments.)
     - sshprocess.cpp: add a bit more debugging - also print out the unmodified
       raw output of SSH commands.
+    - onmainwindow.cpp: remove now-bogus double quote escaping.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f5e8984..c3b5df3 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -5056,11 +5056,6 @@ void ONMainWindow::slotRetResumeSess ( bool result,
                      resumingSession.sessionId+
                      "/.pulse-client.conf\"";
 
-            /* Escape quotes - executing commands with Kerberos/GSSApi enabled adds another layer of quoting. */
-            if (sshConnection->useKerberos ()) {
-                scmd.replace ('"', "\\\"");
-            }
-
             sshConnection->executeCommand (scmd);
 
             bool sysPulse=false;
@@ -5517,11 +5512,6 @@ void ONMainWindow::slotSetModMap()
 
     QString cmd = "export DISPLAY=\":" + resumingSession.display + "\"; echo \"" + kbMap + "\" | xmodmap -";
 
-    /* Escape quotes - executing commands with Kerberos/GSSApi enabled adds another layer of quoting. */
-    if (sshConnection->useKerberos ()) {
-        cmd.replace ('"', "\\\"");
-    }
-
     sshConnection->executeCommand (cmd);
 }
 #endif
@@ -6411,11 +6401,6 @@ void ONMainWindow::runApplication(QString exec)
                 + resumingSession.display
                 + " setsid " + exec + " 1> /dev/null 2>/dev/null & exit";
 
-    /* Escape quotes - executing commands with Kerberos/GSSApi enabled adds another layer of quoting. */
-    if (sshConnection->useKerberos ()) {
-        cmd.replace ('"', "\\\"");
-    }
-
     sshConnection->executeCommand (cmd);
 }
 

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