1 files changed, 14 insertions, 2 deletions

diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index cebc845..d8b1014 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -23,2 +23,4 @@
 #include <qpe/qpeapplication.h>
+#include <qdir.h>
+#include <qfile.h>
 #include <qmultilineedit.h>
@@ -30,2 +32,4 @@
 #include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
 #include <stdlib.h>
@@ -41,3 +45,11 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
 {
-    char *home = getenv("HOME");
+    /* If we had a controlling TTY, detach from it.
+       This is to ensure that SSH uses ssh-askpass */
+    int fd = open("/dev/tty", O_RDONLY);
+    if (fd != -1) {
+        ioctl(fd, TIOCNOTTY, NULL);
+        close(fd);
+    }
+
+    QCString home = QFile::encodeName( QDir::homeDirPath() );
     unsigned i;
@@ -63,3 +75,3 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
             thiskeyname[31] = 0;
-            snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]);
+            snprintf(thiskeyname, 31, "%s/.ssh/%s", home.data(), keynames[i]);
             if (!access(thiskeyname, R_OK)) {