[X2Go-Commits] [x2goclient] 03/05: src/onmainwindow.cpp: instead of searching for "sftp-binary", try to look for "sftp-server" in the Qt 5.x code path.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 29 06:45:09 CET 2020


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 70b4561ad674281dd1429c3d971ac70fd6bcc5a6
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jan 25 18:40:58 2020 +0100

    src/onmainwindow.cpp: instead of searching for "sftp-binary", try to look for "sftp-server" in the Qt 5.x code path.
    
    Luckily this only affects cases where we bundle sftp-server (which we
    don't) or where sftp-server is actually part of $PATH (which it usually
    shouldn't be).
---
 debian/changelog     | 4 ++++
 src/onmainwindow.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 577285a..0111678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -154,6 +154,10 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.cpp: stop PulseAudio from spamming logs after a client
       disconnects. Fixes: #1425. Patch based on one submitted by Ville
       Salmela.
+    - src/onmainwindow.cpp: instead of searching for "sftp-binary", try to
+      look for "sftp-server" in the Qt 5.x code path. Luckily this only
+      affects cases where we bundle sftp-server (which we don't) or where
+      sftp-server is actually part of $PATH (which it usually shouldn't be).
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f640766..e2d5f19 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -10870,12 +10870,12 @@ void ONMainWindow::generateEtcFiles()
     QStringList search_paths;
     search_paths << appDir;
 
-    sftp_binary = QStandardPaths::findExecutable ("sftp-binary", search_paths);
+    sftp_binary = QStandardPaths::findExecutable ("sftp-server", search_paths);
 
     if (sftp_binary.isEmpty ()) {
       search_paths = QStringList ();
 
-      sftp_binary = QStandardPaths::findExecutable ("sftp-binary", search_paths);
+      sftp_binary = QStandardPaths::findExecutable ("sftp-server", search_paths);
 
       if (sftp_binary.isEmpty ()) {
         search_paths = common_sftp_dirs;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list