author | zecke <zecke> | 2004-11-15 15:37:47 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-11-15 15:37:47 (UTC) |
commit | 0d5b9141a5bda1406c513d174dbce95eb5ed0a97 (patch) (unidiff) | |
tree | b15b19e2b7e5bec80d7570d10545b51bac9a9a36 /noncore/settings/sshkeys | |
parent | ef26112d97cd5573642a0f00fd54347229857402 (diff) | |
download | opie-0d5b9141a5bda1406c513d174dbce95eb5ed0a97.zip opie-0d5b9141a5bda1406c513d174dbce95eb5ed0a97.tar.gz opie-0d5b9141a5bda1406c513d174dbce95eb5ed0a97.tar.bz2 |
Move the method out
-rw-r--r-- | noncore/settings/sshkeys/sshkeys.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index d8b1014..57118c9 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp | |||
@@ -35,24 +35,31 @@ | |||
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include <unistd.h> | 36 | #include <unistd.h> |
37 | #include <stdio.h> | 37 | #include <stdio.h> |
38 | #include <ctype.h> | 38 | #include <ctype.h> |
39 | 39 | ||
40 | using namespace Opie::Core; | 40 | using namespace Opie::Core; |
41 | static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; | 41 | static const char *keynames[] = { "identity", "id_rsa", "id_dsa" }; |
42 | 42 | ||
43 | SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | 43 | |
44 | : SSHKeysBase( parent, name, fl ) | 44 | static void detachTerminal() { |
45 | { | ||
46 | /* If we had a controlling TTY, detach from it. | 45 | /* If we had a controlling TTY, detach from it. |
47 | This is to ensure that SSH uses ssh-askpass */ | 46 | This is to ensure that SSH uses ssh-askpass */ |
48 | int fd = open("/dev/tty", O_RDONLY); | 47 | int fd = open("/dev/tty", O_RDONLY); |
49 | if (fd != -1) { | 48 | if (fd != -1) { |
50 | ioctl(fd, TIOCNOTTY, NULL); | 49 | ioctl(fd, TIOCNOTTY, NULL); |
51 | close(fd); | 50 | close(fd); |
52 | } | 51 | } |
52 | } | ||
53 | |||
54 | |||
55 | SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | ||
56 | : SSHKeysBase( parent, name, fl ) | ||
57 | { | ||
58 | detachTerminal(); | ||
59 | |||
53 | 60 | ||
54 | QCString home = QFile::encodeName( QDir::homeDirPath() ); | 61 | QCString home = QFile::encodeName( QDir::homeDirPath() ); |
55 | unsigned i; | 62 | unsigned i; |
56 | 63 | ||
57 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); | 64 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); |
58 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); | 65 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); |